/mandos/release : revision 237.12.11

28

# along with this program. If not, see

29

# <http://www.gnu.org/licenses/>.

30

#

31

# Contact the authors at <mandos@fukt.bsnet.se>.

31

# Contact the authors at <mandos@recompile.se>.

32

#

33

34

from __future__ import (division, absolute_import, print_function,

36

37

import SocketServer as socketserver

38

import socket

39

import optparse

39

import argparse

40

import datetime

41

import errno

42

import gnutls.crypto

62

import functools

63

import cPickle as pickle

64

import multiprocessing

65

import types

66

import binascii

67

import tempfile

65

68

66

69

import dbus

67

70

import dbus.service

72

75

import ctypes.util

73

76

import xml.dom.minidom

74

77

import inspect

78

import GnuPGInterface

75

79

76

80

try:

77

81

SO_BINDTODEVICE = socket.SO_BINDTODEVICE

82

86

SO_BINDTODEVICE = None

83

87

84

88

85

version = "1.3.0"

89

version = "1.4.1"

90

stored_state_file = "clients.pickle"

86

91

87

#logger = logging.getLogger('mandos')

88

logger = logging.Logger('mandos')

92

logger = logging.getLogger()

89

93

syslogger = (logging.handlers.SysLogHandler

90

94

(facility = logging.handlers.SysLogHandler.LOG_DAEMON,

91

95

address = str("/dev/log")))

92

syslogger.setFormatter(logging.Formatter

93

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

94

' %(message)s'))

95

logger.addHandler(syslogger)

96

97

console = logging.StreamHandler()

98

console.setFormatter(logging.Formatter('%(name)s [%(process)d]:'

99

' %(levelname)s:'

100

' %(message)s'))

101

logger.addHandler(console)

96

97

try:

98

if_nametoindex = (ctypes.cdll.LoadLibrary

99

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

100

.if_nametoindex)

101

except (OSError, AttributeError):

102

def if_nametoindex(interface):

103

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

104

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

105

with contextlib.closing(socket.socket()) as s:

106

ifreq = fcntl.ioctl(s, SIOCGIFINDEX,

107

struct.pack(str("16s16x"),

108

interface))

109

interface_index = struct.unpack(str("I"),

110

ifreq[16:20])[0]

111

return interface_index

112

113

114

def initlogger(level=logging.WARNING):

115

"""init logger and add loglevel"""

116

117

syslogger.setFormatter(logging.Formatter

118

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

119

' %(message)s'))

120

logger.addHandler(syslogger)

121

122

console = logging.StreamHandler()

123

console.setFormatter(logging.Formatter('%(asctime)s %(name)s'

124

' [%(process)d]:'

125

' %(levelname)s:'

126

' %(message)s'))

127

logger.addHandler(console)

128

logger.setLevel(level)

129

130

131

class PGPError(Exception):

132

"""Exception if encryption/decryption fails"""

133

pass

134

135

136

class PGPEngine(object):

137

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

138

def __init__(self):

139

self.gnupg = GnuPGInterface.GnuPG()

140

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

141

self.gnupg = GnuPGInterface.GnuPG()

142

self.gnupg.options.meta_interactive = False

143

self.gnupg.options.homedir = self.tempdir

144

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

145

'--quiet'])

146

147

def __enter__(self):

148

return self

149

150

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

151

self._cleanup()

152

return False

153

154

def __del__(self):

155

self._cleanup()

156

157

def _cleanup(self):

158

if self.tempdir is not None:

159

# Delete contents of tempdir

160

for root, dirs, files in os.walk(self.tempdir,

161

topdown = False):

162

for filename in files:

163

os.remove(os.path.join(root, filename))

164

for dirname in dirs:

165

os.rmdir(os.path.join(root, dirname))

166

# Remove tempdir

167

os.rmdir(self.tempdir)

168

self.tempdir = None

169

170

def password_encode(self, password):

171

# Passphrase can not be empty and can not contain newlines or

172

# NUL bytes. So we prefix it and hex encode it.

173

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

174

175

def encrypt(self, data, password):

176

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

177

with open(os.devnull) as devnull:

178

try:

179

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

180

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

181

attach_fhs={'stderr': devnull})

182

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

183

f.write(data)

184

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

185

ciphertext = f.read()

186

proc.wait()

187

except IOError as e:

188

raise PGPError(e)

189

self.gnupg.passphrase = None

190

return ciphertext

191

192

def decrypt(self, data, password):

193

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

194

with open(os.devnull) as devnull:

195

try:

196

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

197

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

198

attach_fhs={'stderr': devnull})

199

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

200

f.write(data)

201

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

202

decrypted_plaintext = f.read()

203

proc.wait()

204

except IOError as e:

205

raise PGPError(e)

206

self.gnupg.passphrase = None

207

return decrypted_plaintext

208

209

102

210

103

211

class AvahiError(Exception):

104

212

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

151

259

self.group = None # our entry group

152

260

self.server = None

153

261

self.bus = bus

262

self.entry_group_state_changed_match = None

154

263

def rename(self):

155

264

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

156

265

if self.rename_count >= self.max_renames:

158

267

" after %i retries, exiting.",

159

268

self.rename_count)

160

269

raise AvahiServiceError("Too many renames")

161

self.name = unicode(self.server.GetAlternativeServiceName(self.name))

270

self.name = unicode(self.server

271

.GetAlternativeServiceName(self.name))

162

272

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

163

273

self.name)

164

syslogger.setFormatter(logging.Formatter

165

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

166

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

167

% self.name))

168

274

self.remove()

169

275

try:

170

276

self.add()

171

except dbus.exceptions.DBusException, error:

277

except dbus.exceptions.DBusException as error:

172

278

logger.critical("DBusException: %s", error)

173

279

self.cleanup()

174

280

os._exit(1)

175

281

self.rename_count += 1

176

282

def remove(self):

177

283

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

284

if self.entry_group_state_changed_match is not None:

285

self.entry_group_state_changed_match.remove()

286

self.entry_group_state_changed_match = None

178

287

if self.group is not None:

179

288

self.group.Reset()

180

289

def add(self):

181

290

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

291

self.remove()

182

292

if self.group is None:

183

293

self.group = dbus.Interface(

184

294

self.bus.get_object(avahi.DBUS_NAME,

185

295

self.server.EntryGroupNew()),

186

296

avahi.DBUS_INTERFACE_ENTRY_GROUP)

187

self.group.connect_to_signal('StateChanged',

188

self

189

.entry_group_state_changed)

297

self.entry_group_state_changed_match = (

298

self.group.connect_to_signal(

299

'StateChanged', self.entry_group_state_changed))

190

300

logger.debug("Adding Zeroconf service '%s' of type '%s' ...",

191

301

self.name, self.type)

192

302

self.group.AddService(

215

325

def cleanup(self):

216

326

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

217

327

if self.group is not None:

218

self.group.Free()

328

try:

329

self.group.Free()

330

except (dbus.exceptions.UnknownMethodException,

331

dbus.exceptions.DBusException):

332

pass

219

333

self.group = None

220

def server_state_changed(self, state):

334

self.remove()

335

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

221

336

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

222

337

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

223

if state == avahi.SERVER_COLLISION:

224

logger.error("Zeroconf server name collision")

225

self.remove()

338

bad_states = { avahi.SERVER_INVALID:

339

"Zeroconf server invalid",

340

avahi.SERVER_REGISTERING: None,

341

avahi.SERVER_COLLISION:

342

"Zeroconf server name collision",

343

avahi.SERVER_FAILURE:

344

"Zeroconf server failure" }

345

if state in bad_states:

346

if bad_states[state] is not None:

347

if error is None:

348

logger.error(bad_states[state])

349

else:

350

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

351

self.cleanup()

226

352

elif state == avahi.SERVER_RUNNING:

227

353

self.add()

354

else:

355

if error is None:

356

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

357

else:

358

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

228

359

def activate(self):

229

360

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

230

361

if self.server is None:

231

362

self.server = dbus.Interface(

232

363

self.bus.get_object(avahi.DBUS_NAME,

233

avahi.DBUS_PATH_SERVER),

364

avahi.DBUS_PATH_SERVER,

365

follow_name_owner_changes=True),

234

366

avahi.DBUS_INTERFACE_SERVER)

235

367

self.server.connect_to_signal("StateChanged",

236

368

self.server_state_changed)

237

369

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

238

370

371

class AvahiServiceToSyslog(AvahiService):

372

def rename(self):

373

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

374

ret = AvahiService.rename(self)

375

syslogger.setFormatter(logging.Formatter

376

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

377

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

378

% self.name))

379

return ret

239

380

381

def timedelta_to_milliseconds(td):

382

"Convert a datetime.timedelta() to milliseconds"

383

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

384

+ (td.seconds * 1000)

385

+ (td.microseconds // 1000))

386

240

387

class Client(object):

241

388

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

242

389

243

390

Attributes:

244

_approved: bool(); 'None' if not yet approved/disapproved

391

approved: bool(); 'None' if not yet approved/disapproved

245

392

approval_delay: datetime.timedelta(); Time to wait for approval

246

393

approval_duration: datetime.timedelta(); Duration of one approval

247

394

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

254

401

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

255

402

checker_initiator_tag: a gobject event source tag, or None

256

403

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

404

client_structure: Object describing what attributes a client has

405

and is used for storing the client at exit

257

406

current_checker_command: string; current running checker_command

258

disable_hook: If set, called by disable() as disable_hook(self)

259

407

disable_initiator_tag: a gobject event source tag, or None

260

408

enabled: bool()

261

409

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

264

412

interval: datetime.timedelta(); How often to start a new checker

265

413

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

266

414

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

267

last_enabled: datetime.datetime(); (UTC)

415

416

last_checker_status: integer between 0 and 255 reflecting exit

417

status of last checker. -1 reflects crashed

418

checker, or None.

419

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

268

420

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

269

421

D-Bus identifiers

270

422

secret: bytestring; sent verbatim (over TLS) to client

271

423

timeout: datetime.timedelta(); How long from last_checked_ok

272

424

until this client is disabled

425

extended_timeout: extra long timeout when password has been sent

273

426

runtime_expansions: Allowed attributes for runtime expansion.

427

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

428

disabled, or None

274

429

"""

275

430

276

431

runtime_expansions = ("approval_delay", "approval_duration",

278

433

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

279

434

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

280

435

281

@staticmethod

282

def _timedelta_to_milliseconds(td):

283

"Convert a datetime.timedelta() to milliseconds"

284

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

285

+ (td.seconds * 1000)

286

+ (td.microseconds // 1000))

287

288

436

def timeout_milliseconds(self):

289

437

"Return the 'timeout' attribute in milliseconds"

290

return self._timedelta_to_milliseconds(self.timeout)

438

return timedelta_to_milliseconds(self.timeout)

439

440

def extended_timeout_milliseconds(self):

441

"Return the 'extended_timeout' attribute in milliseconds"

442

return timedelta_to_milliseconds(self.extended_timeout)

291

443

292

444

def interval_milliseconds(self):

293

445

"Return the 'interval' attribute in milliseconds"

294

return self._timedelta_to_milliseconds(self.interval)

295

446

return timedelta_to_milliseconds(self.interval)

447

296

448

def approval_delay_milliseconds(self):

297

return self._timedelta_to_milliseconds(self.approval_delay)

449

return timedelta_to_milliseconds(self.approval_delay)

298

450

299

def __init__(self, name = None, disable_hook=None, config=None):

451

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

300

452

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

301

453

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

302

454

attribute."""

322

474

% self.name)

323

475

self.host = config.get("host", "")

324

476

self.created = datetime.datetime.utcnow()

325

self.enabled = False

477

self.enabled = config.get("enabled", True)

326

478

self.last_approval_request = None

327

self.last_enabled = None

479

if self.enabled:

480

self.last_enabled = datetime.datetime.utcnow()

481

else:

482

self.last_enabled = None

328

483

self.last_checked_ok = None

484

self.last_checker_status = None

329

485

self.timeout = string_to_delta(config["timeout"])

486

self.extended_timeout = string_to_delta(config

487

["extended_timeout"])

330

488

self.interval = string_to_delta(config["interval"])

331

self.disable_hook = disable_hook

332

489

self.checker = None

333

490

self.checker_initiator_tag = None

334

491

self.disable_initiator_tag = None

492

if self.enabled:

493

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

494

else:

495

self.expires = None

335

496

self.checker_callback_tag = None

336

497

self.checker_command = config["checker"]

337

498

self.current_checker_command = None

338

self.last_connect = None

339

self._approved = None

499

self.approved = None

340

500

self.approved_by_default = config.get("approved_by_default",

341

501

True)

342

502

self.approvals_pending = 0

344

504

config["approval_delay"])

345

505

self.approval_duration = string_to_delta(

346

506

config["approval_duration"])

347

self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())

507

self.changedstate = (multiprocessing_manager

508

.Condition(multiprocessing_manager

509

.Lock()))

510

self.client_structure = [attr for attr in

511

self.__dict__.iterkeys()

512

if not attr.startswith("_")]

513

self.client_structure.append("client_structure")

514

515

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

516

lambda obj:

517

isinstance(obj,

518

property)):

519

if not name.startswith("_"):

520

self.client_structure.append(name)

348

521

522

# Send notice to process children that client state has changed

349

523

def send_changedstate(self):

350

self.changedstate.acquire()

351

self.changedstate.notify_all()

352

self.changedstate.release()

353

524

with self.changedstate:

525

self.changedstate.notify_all()

526

354

527

def enable(self):

355

528

"""Start this client's checker and timeout hooks"""

356

529

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

357

530

# Already enabled

358

531

return

359

532

self.send_changedstate()

533

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

534

self.enabled = True

360

535

self.last_enabled = datetime.datetime.utcnow()

361

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

362

# and every interval from then on.

363

self.checker_initiator_tag = (gobject.timeout_add

364

(self.interval_milliseconds(),

365

self.start_checker))

366

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

367

self.disable_initiator_tag = (gobject.timeout_add

368

(self.timeout_milliseconds(),

369

self.disable))

370

self.enabled = True

371

# Also start a new checker *right now*.

372

self.start_checker()

536

self.init_checker()

373

537

374

538

def disable(self, quiet=True):

375

539

"""Disable this client."""

382

546

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

383

547

gobject.source_remove(self.disable_initiator_tag)

384

548

self.disable_initiator_tag = None

549

self.expires = None

385

550

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

386

551

gobject.source_remove(self.checker_initiator_tag)

387

552

self.checker_initiator_tag = None

388

553

self.stop_checker()

389

if self.disable_hook:

390

self.disable_hook(self)

391

554

self.enabled = False

392

555

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

393

556

return False

394

557

395

558

def __del__(self):

396

self.disable_hook = None

397

559

self.disable()

398

560

561

def init_checker(self):

562

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

563

# and every interval from then on.

564

self.checker_initiator_tag = (gobject.timeout_add

565

(self.interval_milliseconds(),

566

self.start_checker))

567

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

568

self.disable_initiator_tag = (gobject.timeout_add

569

(self.timeout_milliseconds(),

570

self.disable))

571

# Also start a new checker *right now*.

572

self.start_checker()

573

399

574

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

400

575

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

401

576

self.checker_callback_tag = None

402

577

self.checker = None

403

578

if os.WIFEXITED(condition):

404

exitstatus = os.WEXITSTATUS(condition)

405

if exitstatus == 0:

579

self.last_checker_status = os.WEXITSTATUS(condition)

580

if self.last_checker_status == 0:

406

581

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

407

582

vars(self))

408

583

self.checked_ok()

410

585

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

411

586

vars(self))

412

587

else:

588

self.last_checker_status = -1

413

589

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

414

590

vars(self))

415

591

416

def checked_ok(self):

592

def checked_ok(self, timeout=None):

417

593

"""Bump up the timeout for this client.

418

594

419

595

This should only be called when the client has been seen,

420

596

alive and well.

421

597

"""

598

if timeout is None:

599

timeout = self.timeout

422

600

self.last_checked_ok = datetime.datetime.utcnow()

423

gobject.source_remove(self.disable_initiator_tag)

424

self.disable_initiator_tag = (gobject.timeout_add

425

(self.timeout_milliseconds(),

426

self.disable))

601

if self.disable_initiator_tag is not None:

602

gobject.source_remove(self.disable_initiator_tag)

603

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

604

self.disable_initiator_tag = (gobject.timeout_add

605

(timedelta_to_milliseconds

606

(timeout), self.disable))

607

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

427

608

428

609

def need_approval(self):

429

610

self.last_approval_request = datetime.datetime.utcnow()

445

626

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

446

627

try:

447

628

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

448

except (AttributeError, OSError), error:

629

except (AttributeError, OSError) as error:

449

630

if (isinstance(error, OSError)

450

631

and error.errno != errno.ECHILD):

451

632

raise error

469

650

'replace')))

470

651

for attr in

471

652

self.runtime_expansions)

472

653

473

654

try:

474

655

command = self.checker_command % escaped_attrs

475

except TypeError, error:

656

except TypeError as error:

476

657

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

477

658

' %s', self.checker_command, error)

478

659

return True # Try again later

497

678

if pid:

498

679

gobject.source_remove(self.checker_callback_tag)

499

680

self.checker_callback(pid, status, command)

500

except OSError, error:

681

except OSError as error:

501

682

logger.error("Failed to start subprocess: %s",

502

683

error)

503

684

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

516

697

#time.sleep(0.5)

517

698

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

518

699

# os.kill(self.checker.pid, signal.SIGKILL)

519

except OSError, error:

700

except OSError as error:

520

701

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

521

702

raise

522

703

self.checker = None

523

704

705

524

706

def dbus_service_property(dbus_interface, signature="v",

525

707

access="readwrite", byte_arrays=False):

526

708

"""Decorators for marking methods of a DBusObjectWithProperties to

572

754

573

755

class DBusObjectWithProperties(dbus.service.Object):

574

756

"""A D-Bus object with properties.

575

757

576

758

Classes inheriting from this can use the dbus_service_property

577

759

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

578

760

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

585

767

def _get_all_dbus_properties(self):

586

768

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

587

769

"""

588

return ((prop._dbus_name, prop)

770

return ((prop.__get__(self)._dbus_name, prop.__get__(self))

771

for cls in self.__class__.__mro__

589

772

for name, prop in

590

inspect.getmembers(self, self._is_dbus_property))

773

inspect.getmembers(cls, self._is_dbus_property))

591

774

592

775

def _get_dbus_property(self, interface_name, property_name):

593

776

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

594

777

property with the specified name and interface.

595

778

"""

596

for name in (property_name,

597

property_name + "_dbus_property"):

598

prop = getattr(self, name, None)

599

if (prop is None

600

or not self._is_dbus_property(prop)

601

or prop._dbus_name != property_name

602

or (interface_name and prop._dbus_interface

603

and interface_name != prop._dbus_interface)):

604

continue

605

return prop

779

for cls in self.__class__.__mro__:

780

for name, value in (inspect.getmembers

781

(cls, self._is_dbus_property)):

782

if (value._dbus_name == property_name

783

and value._dbus_interface == interface_name):

784

return value.__get__(self)

785

606

786

# No such property

607

787

raise DBusPropertyNotFound(self.dbus_object_path + ":"

608

788

+ interface_name + "."

642

822

def GetAll(self, interface_name):

643

823

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

644

824

standard.

645

825

646

826

Note: Will not include properties with access="write".

647

827

"""

648

all = {}

828

properties = {}

649

829

for name, prop in self._get_all_dbus_properties():

650

830

if (interface_name

651

831

and interface_name != prop._dbus_interface):

656

836

continue

657

837

value = prop()

658

838

if not hasattr(value, "variant_level"):

659

all[name] = value

839

properties[name] = value

660

840

continue

661

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

662

value.variant_level+1)

663

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

841

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

842

value.variant_level+1)

843

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

664

844

665

845

@dbus.service.method(dbus.INTROSPECTABLE_IFACE,

666

846

out_signature="s",

704

884

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

705

885

document.unlink()

706

886

except (AttributeError, xml.dom.DOMException,

707

xml.parsers.expat.ExpatError), error:

887

xml.parsers.expat.ExpatError) as error:

708

888

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

709

889

error)

710

890

return xmlstring

711

891

712

892

893

def datetime_to_dbus (dt, variant_level=0):

894

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

895

if dt is None:

896

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

897

return dbus.String(dt.isoformat(),

898

variant_level=variant_level)

899

900

901

class AlternateDBusNamesMetaclass(DBusObjectWithProperties

902

.__metaclass__):

903

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

904

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

905

"""

906

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

907

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

908

# methods, signals, or properties in them

909

for base in (b for b in bases

910

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

911

# Go though all attributes of the base class

912

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

913

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

914

# with the wrong interface name

915

if (not hasattr(attribute, "_dbus_interface")

916

or not attribute._dbus_interface

917

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

918

continue

919

# Create an alternate D-Bus interface name based on

920

# the current name

921

alt_interface = (attribute._dbus_interface

922

.replace("se.recompile.Mandos",

923

"se.bsnet.fukt.Mandos"))

924

# Is this a D-Bus signal?

925

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

926

# Extract the original non-method function by

927

# black magic

928

nonmethod_func = (dict(

929

zip(attribute.func_code.co_freevars,

930

attribute.__closure__))["func"]

931

.cell_contents)

932

# Create a new, but exactly alike, function

933

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

934

# with the alternate D-Bus interface name

935

new_function = (dbus.service.signal

936

(alt_interface,

937

attribute._dbus_signature)

938

(types.FunctionType(

939

nonmethod_func.func_code,

940

nonmethod_func.func_globals,

941

nonmethod_func.func_name,

942

nonmethod_func.func_defaults,

943

nonmethod_func.func_closure)))

944

# Define a creator of a function to call both the

945

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

946

# signals gets sent when the function is called

947

def fixscope(func1, func2):

948

"""This function is a scope container to pass

949

func1 and func2 to the "call_both" function

950

outside of its arguments"""

951

def call_both(*args, **kwargs):

952

"""This function will emit two D-Bus

953

signals by calling func1 and func2"""

954

func1(*args, **kwargs)

955

func2(*args, **kwargs)

956

return call_both

957

# Create the "call_both" function and add it to

958

# the class

959

attr[attrname] = fixscope(attribute,

960

new_function)

961

# Is this a D-Bus method?

962

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

963

# Create a new, but exactly alike, function

964

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

965

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

966

# to the class.

967

attr[attrname] = (dbus.service.method

968

(alt_interface,

969

attribute._dbus_in_signature,

970

attribute._dbus_out_signature)

971

(types.FunctionType

972

(attribute.func_code,

973

attribute.func_globals,

974

attribute.func_name,

975

attribute.func_defaults,

976

attribute.func_closure)))

977

# Is this a D-Bus property?

978

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

979

# Create a new, but exactly alike, function

980

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

981

# property with the alternate D-Bus interface

982

# name. Add it to the class.

983

attr[attrname] = (dbus_service_property

984

(alt_interface,

985

attribute._dbus_signature,

986

attribute._dbus_access,

987

attribute

988

._dbus_get_args_options

989

["byte_arrays"])

990

(types.FunctionType

991

(attribute.func_code,

992

attribute.func_globals,

993

attribute.func_name,

994

attribute.func_defaults,

995

attribute.func_closure)))

996

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

997

998

713

999

class ClientDBus(Client, DBusObjectWithProperties):

714

1000

"""A Client class using D-Bus

715

1001

724

1010

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

725

1011

726

1012

def __init__(self, bus = None, *args, **kwargs):

1013

self.bus = bus

1014

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

1015

727

1016

self._approvals_pending = 0

728

self.bus = bus

729

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

730

1017

# Only now, when this client is initialized, can it show up on

731

1018

# the D-Bus

732

1019

client_object_name = unicode(self.name).translate(

737

1024

DBusObjectWithProperties.__init__(self, self.bus,

738

1025

self.dbus_object_path)

739

1026

740

def _get_approvals_pending(self):

741

return self._approvals_pending

742

def _set_approvals_pending(self, value):

743

old_value = self._approvals_pending

744

self._approvals_pending = value

745

bval = bool(value)

746

if (hasattr(self, "dbus_object_path")

747

and bval is not bool(old_value)):

748

dbus_bool = dbus.Boolean(bval, variant_level=1)

749

self.PropertyChanged(dbus.String("ApprovalPending"),

750

dbus_bool)

751

752

approvals_pending = property(_get_approvals_pending,

753

_set_approvals_pending)

754

del _get_approvals_pending, _set_approvals_pending

755

756

@staticmethod

757

def _datetime_to_dbus(dt, variant_level=0):

758

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

759

return dbus.String(dt.isoformat(),

760

variant_level=variant_level)

761

762

def enable(self):

763

oldstate = getattr(self, "enabled", False)

764

r = Client.enable(self)

765

if oldstate != self.enabled:

766

# Emit D-Bus signals

767

self.PropertyChanged(dbus.String("Enabled"),

768

dbus.Boolean(True, variant_level=1))

769

self.PropertyChanged(

770

dbus.String("LastEnabled"),

771

self._datetime_to_dbus(self.last_enabled,

772

variant_level=1))

773

return r

774

775

def disable(self, quiet = False):

776

oldstate = getattr(self, "enabled", False)

777

r = Client.disable(self, quiet=quiet)

778

if not quiet and oldstate != self.enabled:

779

# Emit D-Bus signal

780

self.PropertyChanged(dbus.String("Enabled"),

781

dbus.Boolean(False, variant_level=1))

782

return r

1027

def notifychangeproperty(transform_func,

1028

dbus_name, type_func=lambda x: x,

1029

variant_level=1):

1030

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

1031

its changes to DBus.

1032

1033

transform_fun: Function that takes a value and a variant_level

1034

and transforms it to a D-Bus type.

1035

dbus_name: D-Bus name of the variable

1036

type_func: Function that transform the value before sending it

1037

to the D-Bus. Default: no transform

1038

variant_level: D-Bus variant level. Default: 1

1039

"""

1040

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

1041

def setter(self, value):

1042

if hasattr(self, "dbus_object_path"):

1043

if (not hasattr(self, attrname) or

1044

type_func(getattr(self, attrname, None))

1045

!= type_func(value)):

1046

dbus_value = transform_func(type_func(value),

1047

variant_level

1048

=variant_level)

1049

self.PropertyChanged(dbus.String(dbus_name),

1050

dbus_value)

1051

setattr(self, attrname, value)

1052

1053

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

1054

1055

1056

expires = notifychangeproperty(datetime_to_dbus, "Expires")

1057

approvals_pending = notifychangeproperty(dbus.Boolean,

1058

"ApprovalPending",

1059

type_func = bool)

1060

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

1061

last_enabled = notifychangeproperty(datetime_to_dbus,

1062

"LastEnabled")

1063

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

1064

type_func = lambda checker:

1065

checker is not None)

1066

last_checked_ok = notifychangeproperty(datetime_to_dbus,

1067

"LastCheckedOK")

1068

last_approval_request = notifychangeproperty(

1069

datetime_to_dbus, "LastApprovalRequest")

1070

approved_by_default = notifychangeproperty(dbus.Boolean,

1071

"ApprovedByDefault")

1072

approval_delay = notifychangeproperty(dbus.UInt16,

1073

"ApprovalDelay",

1074

type_func =

1075

timedelta_to_milliseconds)

1076

approval_duration = notifychangeproperty(

1077

dbus.UInt16, "ApprovalDuration",

1078

type_func = timedelta_to_milliseconds)

1079

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

1080

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

1081

type_func =

1082

timedelta_to_milliseconds)

1083

extended_timeout = notifychangeproperty(

1084

dbus.UInt16, "ExtendedTimeout",

1085

type_func = timedelta_to_milliseconds)

1086

interval = notifychangeproperty(dbus.UInt16,

1087

"Interval",

1088

type_func =

1089

timedelta_to_milliseconds)

1090

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

1091

1092

del notifychangeproperty

783

1093

784

1094

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

785

1095

try:

794

1104

*args, **kwargs):

795

1105

self.checker_callback_tag = None

796

1106

self.checker = None

797

# Emit D-Bus signal

798

self.PropertyChanged(dbus.String("CheckerRunning"),

799

dbus.Boolean(False, variant_level=1))

800

1107

if os.WIFEXITED(condition):

801

1108

exitstatus = os.WEXITSTATUS(condition)

802

1109

# Emit D-Bus signal

812

1119

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

813

1120

*args, **kwargs)

814

1121

815

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

816

r = Client.checked_ok(self, *args, **kwargs)

817

# Emit D-Bus signal

818

self.PropertyChanged(

819

dbus.String("LastCheckedOK"),

820

(self._datetime_to_dbus(self.last_checked_ok,

821

variant_level=1)))

822

return r

823

824

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

825

r = Client.need_approval(self, *args, **kwargs)

826

# Emit D-Bus signal

827

self.PropertyChanged(

828

dbus.String("LastApprovalRequest"),

829

(self._datetime_to_dbus(self.last_approval_request,

830

variant_level=1)))

831

return r

832

833

1122

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

834

1123

old_checker = self.checker

835

1124

if self.checker is not None:

842

1131

and old_checker_pid != self.checker.pid):

843

1132

# Emit D-Bus signal

844

1133

self.CheckerStarted(self.current_checker_command)

845

self.PropertyChanged(

846

dbus.String("CheckerRunning"),

847

dbus.Boolean(True, variant_level=1))

848

1134

return r

849

1135

850

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

851

old_checker = getattr(self, "checker", None)

852

r = Client.stop_checker(self, *args, **kwargs)

853

if (old_checker is not None

854

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

855

self.PropertyChanged(dbus.String("CheckerRunning"),

856

dbus.Boolean(False, variant_level=1))

857

return r

858

859

1136

def _reset_approved(self):

860

self._approved = None

1137

self.approved = None

861

1138

return False

862

1139

863

1140

def approve(self, value=True):

864

1141

self.send_changedstate()

865

self._approved = value

866

gobject.timeout_add(self._timedelta_to_milliseconds

1142

self.approved = value

1143

gobject.timeout_add(timedelta_to_milliseconds

867

1144

(self.approval_duration),

868

1145

self._reset_approved)

869

1146

870

1147

871

1148

## D-Bus methods, signals & properties

872

_interface = "se.bsnet.fukt.Mandos.Client"

1149

_interface = "se.recompile.Mandos.Client"

873

1150

874

1151

## Signals

875

1152

912

1189

"D-Bus signal"

913

1190

return self.need_approval()

914

1191

1192

# NeRwequest - signal

1193

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

1194

def NewRequest(self, ip):

1195

"""D-Bus signal

1196

Is sent after a client request a password.

1197

"""

1198

pass

1199

915

1200

## Methods

916

1201

917

1202

# Approve - method

922

1207

# CheckedOK - method

923

1208

@dbus.service.method(_interface)

924

1209

def CheckedOK(self):

925

return self.checked_ok()

1210

self.checked_ok()

926

1211

927

1212

# Enable - method

928

1213

@dbus.service.method(_interface)

961

1246

if value is None: # get

962

1247

return dbus.Boolean(self.approved_by_default)

963

1248

self.approved_by_default = bool(value)

964

# Emit D-Bus signal

965

self.PropertyChanged(dbus.String("ApprovedByDefault"),

966

dbus.Boolean(value, variant_level=1))

967

1249

968

1250

# ApprovalDelay - property

969

1251

@dbus_service_property(_interface, signature="t",

972

1254

if value is None: # get

973

1255

return dbus.UInt64(self.approval_delay_milliseconds())

974

1256

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

975

# Emit D-Bus signal

976

self.PropertyChanged(dbus.String("ApprovalDelay"),

977

dbus.UInt64(value, variant_level=1))

978

1257

979

1258

# ApprovalDuration - property

980

1259

@dbus_service_property(_interface, signature="t",

981

1260

access="readwrite")

982

1261

def ApprovalDuration_dbus_property(self, value=None):

983

1262

if value is None: # get

984

return dbus.UInt64(self._timedelta_to_milliseconds(

1263

return dbus.UInt64(timedelta_to_milliseconds(

985

1264

self.approval_duration))

986

1265

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

987

# Emit D-Bus signal

988

self.PropertyChanged(dbus.String("ApprovalDuration"),

989

dbus.UInt64(value, variant_level=1))

990

1266

991

1267

# Name - property

992

1268

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

1005

1281

if value is None: # get

1006

1282

return dbus.String(self.host)

1007

1283

self.host = value

1008

# Emit D-Bus signal

1009

self.PropertyChanged(dbus.String("Host"),

1010

dbus.String(value, variant_level=1))

1011

1284

1012

1285

# Created - property

1013

1286

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

1014

1287

def Created_dbus_property(self):

1015

return dbus.String(self._datetime_to_dbus(self.created))

1288

return datetime_to_dbus(self.created)

1016

1289

1017

1290

# LastEnabled - property

1018

1291

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

1019

1292

def LastEnabled_dbus_property(self):

1020

if self.last_enabled is None:

1021

return dbus.String("")

1022

return dbus.String(self._datetime_to_dbus(self.last_enabled))

1293

return datetime_to_dbus(self.last_enabled)

1023

1294

1024

1295

# Enabled - property

1025

1296

@dbus_service_property(_interface, signature="b",

1039

1310

if value is not None:

1040

1311

self.checked_ok()

1041

1312

return

1042

if self.last_checked_ok is None:

1043

return dbus.String("")

1044

return dbus.String(self._datetime_to_dbus(self

1045

.last_checked_ok))

1313

return datetime_to_dbus(self.last_checked_ok)

1314

1315

# Expires - property

1316

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

1317

def Expires_dbus_property(self):

1318

return datetime_to_dbus(self.expires)

1046

1319

1047

1320

# LastApprovalRequest - property

1048

1321

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

1049

1322

def LastApprovalRequest_dbus_property(self):

1050

if self.last_approval_request is None:

1051

return dbus.String("")

1052

return dbus.String(self.

1053

_datetime_to_dbus(self

1054

.last_approval_request))

1323

return datetime_to_dbus(self.last_approval_request)

1055

1324

1056

1325

# Timeout - property

1057

1326

@dbus_service_property(_interface, signature="t",

1060

1329

if value is None: # get

1061

1330

return dbus.UInt64(self.timeout_milliseconds())

1062

1331

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

1063

# Emit D-Bus signal

1064

self.PropertyChanged(dbus.String("Timeout"),

1065

dbus.UInt64(value, variant_level=1))

1066

1332

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

1067

1333

return

1068

1334

# Reschedule timeout

1069

1335

gobject.source_remove(self.disable_initiator_tag)

1070

1336

self.disable_initiator_tag = None

1071

time_to_die = (self.

1072

_timedelta_to_milliseconds((self

1073

.last_checked_ok

1074

+ self.timeout)

1075

- datetime.datetime

1076

.utcnow()))

1337

self.expires = None

1338

time_to_die = timedelta_to_milliseconds((self

1339

.last_checked_ok

1340

+ self.timeout)

1341

- datetime.datetime

1342

.utcnow())

1077

1343

if time_to_die <= 0:

1078

1344

# The timeout has passed

1079

1345

self.disable()

1080

1346

else:

1347

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

1348

+ datetime.timedelta(milliseconds =

1349

time_to_die))

1081

1350

self.disable_initiator_tag = (gobject.timeout_add

1082

1351

(time_to_die, self.disable))

1083

1352

1353

# ExtendedTimeout - property

1354

@dbus_service_property(_interface, signature="t",

1355

access="readwrite")

1356

def ExtendedTimeout_dbus_property(self, value=None):

1357

if value is None: # get

1358

return dbus.UInt64(self.extended_timeout_milliseconds())

1359

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

1360

1084

1361

# Interval - property

1085

1362

@dbus_service_property(_interface, signature="t",

1086

1363

access="readwrite")

1088

1365

if value is None: # get

1089

1366

return dbus.UInt64(self.interval_milliseconds())

1090

1367

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

1091

# Emit D-Bus signal

1092

self.PropertyChanged(dbus.String("Interval"),

1093

dbus.UInt64(value, variant_level=1))

1094

1368

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

1095

1369

return

1096

# Reschedule checker run

1097

gobject.source_remove(self.checker_initiator_tag)

1098

self.checker_initiator_tag = (gobject.timeout_add

1099

(value, self.start_checker))

1100

self.start_checker() # Start one now, too

1101

1370

if self.enabled:

1371

# Reschedule checker run

1372

gobject.source_remove(self.checker_initiator_tag)

1373

self.checker_initiator_tag = (gobject.timeout_add

1374

(value, self.start_checker))

1375

self.start_checker() # Start one now, too

1376

1102

1377

# Checker - property

1103

1378

@dbus_service_property(_interface, signature="s",

1104

1379

access="readwrite")

1106

1381

if value is None: # get

1107

1382

return dbus.String(self.checker_command)

1108

1383

self.checker_command = value

1109

# Emit D-Bus signal

1110

self.PropertyChanged(dbus.String("Checker"),

1111

dbus.String(self.checker_command,

1112

variant_level=1))

1113

1384

1114

1385

# CheckerRunning - property

1115

1386

@dbus_service_property(_interface, signature="b",

1142

1413

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

1143

1414

if not self._pipe.recv():

1144

1415

raise KeyError()

1145

1416

1146

1417

def __getattribute__(self, name):

1147

if(name == '_pipe'):

1418

if name == '_pipe':

1148

1419

return super(ProxyClient, self).__getattribute__(name)

1149

1420

self._pipe.send(('getattr', name))

1150

1421

data = self._pipe.recv()

1155

1426

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

1156

1427

return self._pipe.recv()[1]

1157

1428

return func

1158

1429

1159

1430

def __setattr__(self, name, value):

1160

if(name == '_pipe'):

1431

if name == '_pipe':

1161

1432

return super(ProxyClient, self).__setattr__(name, value)

1162

1433

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

1163

1434

1164

1435

1436

class ClientDBusTransitional(ClientDBus):

1437

__metaclass__ = AlternateDBusNamesMetaclass

1438

1439

1165

1440

class ClientHandler(socketserver.BaseRequestHandler, object):

1166

1441

"""A class to handle client connections.

1167

1442

1174

1449

unicode(self.client_address))

1175

1450

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

1176

1451

self.server.child_pipe.fileno())

1177

1452

1178

1453

session = (gnutls.connection

1179

1454

.ClientSession(self.request,

1180

1455

gnutls.connection

1181

1456

.X509Credentials()))

1182

1457

1183

1458

# Note: gnutls.connection.X509Credentials is really a

1184

1459

# generic GnuTLS certificate credentials object so long as

1185

1460

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

1186

1461

# here despite using OpenPGP certificates.

1187

1462

1188

1463

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

1189

1464

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

1190

1465

# "+COMP-NULL", "+CTYPE-OPENPGP",

1196

1471

(gnutls.library.functions

1197

1472

.gnutls_priority_set_direct(session._c_object,

1198

1473

priority, None))

1199

1474

1200

1475

# Start communication using the Mandos protocol

1201

1476

# Get protocol number

1202

1477

line = self.request.makefile().readline()

1204

1479

try:

1205

1480

if int(line.strip().split()[0]) > 1:

1206

1481

raise RuntimeError

1207

except (ValueError, IndexError, RuntimeError), error:

1482

except (ValueError, IndexError, RuntimeError) as error:

1208

1483

logger.error("Unknown protocol version: %s", error)

1209

1484

return

1210

1485

1211

1486

# Start GnuTLS connection

1212

1487

try:

1213

1488

session.handshake()

1214

except gnutls.errors.GNUTLSError, error:

1489

except gnutls.errors.GNUTLSError as error:

1215

1490

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

1216

1491

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

1217

1492

# established. Just abandon the request.

1218

1493

return

1219

1494

logger.debug("Handshake succeeded")

1220

1495

1221

1496

approval_required = False

1222

1497

try:

1223

1498

try:

1224

1499

fpr = self.fingerprint(self.peer_certificate

1225

1500

(session))

1226

except (TypeError, gnutls.errors.GNUTLSError), error:

1501

except (TypeError,

1502

gnutls.errors.GNUTLSError) as error:

1227

1503

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

1228

1504

return

1229

1505

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

1230

1506

1231

1507

try:

1232

1508

client = ProxyClient(child_pipe, fpr,

1233

1509

self.client_address)

1234

1510

except KeyError:

1235

1511

return

1236

1512

1513

if self.server.use_dbus:

1514

# Emit D-Bus signal

1515

client.NewRequest(str(self.client_address))

1516

1237

1517

if client.approval_delay:

1238

1518

delay = client.approval_delay

1239

1519

client.approvals_pending += 1

1241

1521

1242

1522

while True:

1243

1523

if not client.enabled:

1244

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

1524

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

1245

1525

client.name)

1246

1526

if self.server.use_dbus:

1247

1527

# Emit D-Bus signal

1248

client.Rejected("Disabled")

1528

client.Rejected("Disabled")

1249

1529

return

1250

1530

1251

if client._approved or not client.approval_delay:

1531

if client.approved or not client.approval_delay:

1252

1532

#We are approved or approval is disabled

1253

1533

break

1254

elif client._approved is None:

1534

elif client.approved is None:

1255

1535

logger.info("Client %s needs approval",

1256

1536

client.name)

1257

1537

if self.server.use_dbus:

1268

1548

return

1269

1549

1270

1550

#wait until timeout or approved

1271

#x = float(client._timedelta_to_milliseconds(delay))

1272

1551

time = datetime.datetime.now()

1273

1552

client.changedstate.acquire()

1274

client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))

1553

(client.changedstate.wait

1554

(float(client.timedelta_to_milliseconds(delay)

1555

/ 1000)))

1275

1556

client.changedstate.release()

1276

1557

time2 = datetime.datetime.now()

1277

1558

if (time2 - time) >= delay:

1292

1573

while sent_size < len(client.secret):

1293

1574

try:

1294

1575

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

1295

except (gnutls.errors.GNUTLSError), error:

1576

except gnutls.errors.GNUTLSError as error:

1296

1577

logger.warning("gnutls send failed")

1297

1578

return

1298

1579

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

1299

1580

sent, len(client.secret)

1300

1581

- (sent_size + sent))

1301

1582

sent_size += sent

1302

1583

1303

1584

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

1304

# bump the timeout as if seen

1305

client.checked_ok()

1585

# bump the timeout using extended_timeout

1586

client.checked_ok(client.extended_timeout)

1306

1587

if self.server.use_dbus:

1307

1588

# Emit D-Bus signal

1308

1589

client.GotSecret()

1312

1593

client.approvals_pending -= 1

1313

1594

try:

1314

1595

session.bye()

1315

except (gnutls.errors.GNUTLSError), error:

1596

except gnutls.errors.GNUTLSError as error:

1316

1597

logger.warning("GnuTLS bye failed")

1317

1598

1318

1599

@staticmethod

1375

1656

# Convert the buffer to a Python bytestring

1376

1657

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

1377

1658

# Convert the bytestring to hexadecimal notation

1378

hex_fpr = ''.join("%02X" % ord(char) for char in fpr)

1659

hex_fpr = binascii.hexlify(fpr).upper()

1379

1660

return hex_fpr

1380

1661

1381

1662

1387

1668

except:

1388

1669

self.handle_error(request, address)

1389

1670

self.close_request(request)

1390

1671

1391

1672

def process_request(self, request, address):

1392

1673

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

1393

multiprocessing.Process(target = self.sub_process_main,

1394

args = (request, address)).start()

1674

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

1675

args = (request,

1676

address))

1677

proc.start()

1678

return proc

1679

1395

1680

1396

1681

class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):

1397

1682

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

1401

1686

This function creates a new pipe in self.pipe

1402

1687

"""

1403

1688

parent_pipe, self.child_pipe = multiprocessing.Pipe()

1404

1405

super(MultiprocessingMixInWithPipe,

1406

self).process_request(request, client_address)

1689

1690

proc = MultiprocessingMixIn.process_request(self, request,

1691

client_address)

1407

1692

self.child_pipe.close()

1408

self.add_pipe(parent_pipe)

1409

1410

def add_pipe(self, parent_pipe):

1693

self.add_pipe(parent_pipe, proc)

1694

1695

def add_pipe(self, parent_pipe, proc):

1411

1696

"""Dummy function; override as necessary"""

1412

1697

raise NotImplementedError

1413

1698

1699

1414

1700

class IPv6_TCPServer(MultiprocessingMixInWithPipe,

1415

1701

socketserver.TCPServer, object):

1416

1702

"""IPv6-capable TCP server. Accepts 'None' as address and/or port

1442

1728

SO_BINDTODEVICE,

1443

1729

str(self.interface

1444

1730

+ '\0'))

1445

except socket.error, error:

1731

except socket.error as error:

1446

1732

if error[0] == errno.EPERM:

1447

1733

logger.error("No permission to"

1448

1734

" bind to interface %s",

1490

1776

self.enabled = False

1491

1777

self.clients = clients

1492

1778

if self.clients is None:

1493

self.clients = set()

1779

self.clients = {}

1494

1780

self.use_dbus = use_dbus

1495

1781

self.gnutls_priority = gnutls_priority

1496

1782

IPv6_TCPServer.__init__(self, server_address,

1500

1786

def server_activate(self):

1501

1787

if self.enabled:

1502

1788

return socketserver.TCPServer.server_activate(self)

1789

1503

1790

def enable(self):

1504

1791

self.enabled = True

1505

def add_pipe(self, parent_pipe):

1792

1793

def add_pipe(self, parent_pipe, proc):

1506

1794

# Call "handle_ipc" for both data and EOF events

1507

1795

gobject.io_add_watch(parent_pipe.fileno(),

1508

1796

gobject.IO_IN | gobject.IO_HUP,

1509

1797

functools.partial(self.handle_ipc,

1510

parent_pipe = parent_pipe))

1511

1798

parent_pipe =

1799

parent_pipe,

1800

proc = proc))

1801

1512

1802

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

1513

client_object=None):

1803

proc = None, client_object=None):

1514

1804

condition_names = {

1515

1805

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

1516

1806

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

1525

1815

for cond, name in

1526

1816

condition_names.iteritems()

1527

1817

if cond & condition)

1528

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

1818

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

1529

1819

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

1820

# Wait for other process to exit

1821

proc.join()

1530

1822

return False

1531

1823

1532

1824

# Read a request from the child

1537

1829

fpr = request[1]

1538

1830

address = request[2]

1539

1831

1540

for c in self.clients:

1832

for c in self.clients.itervalues():

1541

1833

if c.fingerprint == fpr:

1542

1834

client = c

1543

1835

break

1544

1836

else:

1545

logger.warning("Client not found for fingerprint: %s, ad"

1546

"dress: %s", fpr, address)

1837

logger.info("Client not found for fingerprint: %s, ad"

1838

"dress: %s", fpr, address)

1547

1839

if self.use_dbus:

1548

1840

# Emit D-Bus signal

1549

mandos_dbus_service.ClientNotFound(fpr, address[0])

1841

mandos_dbus_service.ClientNotFound(fpr,

1842

address[0])

1550

1843

parent_pipe.send(False)

1551

1844

return False

1552

1845

1553

1846

gobject.io_add_watch(parent_pipe.fileno(),

1554

1847

gobject.IO_IN | gobject.IO_HUP,

1555

1848

functools.partial(self.handle_ipc,

1556

parent_pipe = parent_pipe,

1557

client_object = client))

1849

parent_pipe =

1850

parent_pipe,

1851

proc = proc,

1852

client_object =

1853

client))

1558

1854

parent_pipe.send(True)

1559

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

1855

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

1856

# same fileno

1560

1857

return False

1561

1858

if command == 'funcall':

1562

1859

funcname = request[1]

1563

1860

args = request[2]

1564

1861

kwargs = request[3]

1565

1862

1566

parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))

1567

1863

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

1864

funcname)(*args,

1865

**kwargs)))

1866

1568

1867

if command == 'getattr':

1569

1868

attrname = request[1]

1570

1869

if callable(client_object.__getattribute__(attrname)):

1571

1870

parent_pipe.send(('function',))

1572

1871

else:

1573

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

1872

parent_pipe.send(('data', client_object

1873

.__getattribute__(attrname)))

1574

1874

1575

1875

if command == 'setattr':

1576

1876

attrname = request[1]

1577

1877

value = request[2]

1578

1878

setattr(client_object, attrname, value)

1579

1879

1580

1880

return True

1581

1881

1582

1882

1613

1913

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

1614

1914

else:

1615

1915

raise ValueError("Unknown suffix %r" % suffix)

1616

except (ValueError, IndexError), e:

1916

except (ValueError, IndexError) as e:

1617

1917

raise ValueError(*(e.args))

1618

1918

timevalue += delta

1619

1919

return timevalue

1620

1920

1621

1921

1622

def if_nametoindex(interface):

1623

"""Call the C function if_nametoindex(), or equivalent

1624

1625

Note: This function cannot accept a unicode string."""

1626

global if_nametoindex

1627

try:

1628

if_nametoindex = (ctypes.cdll.LoadLibrary

1629

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

1630

.if_nametoindex)

1631

except (OSError, AttributeError):

1632

logger.warning("Doing if_nametoindex the hard way")

1633

def if_nametoindex(interface):

1634

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

1635

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

1636

with contextlib.closing(socket.socket()) as s:

1637

ifreq = fcntl.ioctl(s, SIOCGIFINDEX,

1638

struct.pack(str("16s16x"),

1639

interface))

1640

interface_index = struct.unpack(str("I"),

1641

ifreq[16:20])[0]

1642

return interface_index

1643

return if_nametoindex(interface)

1644

1645

1646

1922

def daemon(nochdir = False, noclose = False):

1647

1923

"""See daemon(3). Standard BSD Unix function.

1648

1924

1673

1949

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

1674

1950

# Parsing of options, both command line and config file

1675

1951

1676

parser = optparse.OptionParser(version = "%%prog %s" % version)

1677

parser.add_option("-i", "--interface", type="string",

1678

metavar="IF", help="Bind to interface IF")

1679

parser.add_option("-a", "--address", type="string",

1680

help="Address to listen for requests on")

1681

parser.add_option("-p", "--port", type="int",

1682

help="Port number to receive requests on")

1683

parser.add_option("--check", action="store_true",

1684

help="Run self-test")

1685

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

1686

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

1687

" terminal")

1688

parser.add_option("--debuglevel", type="string", metavar="LEVEL",

1689

help="Debug level for stdout output")

1690

parser.add_option("--priority", type="string", help="GnuTLS"

1691

" priority string (see GnuTLS documentation)")

1692

parser.add_option("--servicename", type="string",

1693

metavar="NAME", help="Zeroconf service name")

1694

parser.add_option("--configdir", type="string",

1695

default="/etc/mandos", metavar="DIR",

1696

help="Directory to search for configuration"

1697

" files")

1698

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

1699

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

1700

" system bus interface")

1701

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

1702

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

1703

options = parser.parse_args()[0]

1952

parser = argparse.ArgumentParser()

1953

parser.add_argument("-v", "--version", action="version",

1954

version = "%%(prog)s %s" % version,

1955

help="show version number and exit")

1956

parser.add_argument("-i", "--interface", metavar="IF",

1957

help="Bind to interface IF")

1958

parser.add_argument("-a", "--address",

1959

help="Address to listen for requests on")

1960

parser.add_argument("-p", "--port", type=int,

1961

help="Port number to receive requests on")

1962

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

1963

help="Run self-test")

1964

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

1965

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

1966

" to terminal")

1967

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

1968

help="Debug level for stdout output")

1969

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

1970

" priority string (see GnuTLS documentation)")

1971

parser.add_argument("--servicename",

1972

metavar="NAME", help="Zeroconf service name")

1973

parser.add_argument("--configdir",

1974

default="/etc/mandos", metavar="DIR",

1975

help="Directory to search for configuration"

1976

" files")

1977

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

1978

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

1979

" system bus interface")

1980

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

1981

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

1982

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

1983

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

1984

" state")

1985

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

1986

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

1987

1988

options = parser.parse_args()

1704

1989

1705

1990

if options.check:

1706

1991

import doctest

1718

2003

"use_dbus": "True",

1719

2004

"use_ipv6": "True",

1720

2005

"debuglevel": "",

2006

"restore": "True",

2007

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

1721

2008

}

1722

2009

1723

2010

# Parse config file for server-global settings

1740

2027

# options, if set.

1741

2028

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

1742

2029

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

1743

"use_dbus", "use_ipv6", "debuglevel"):

2030

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

2031

"statedir"):

1744

2032

value = getattr(options, option)

1745

2033

if value is not None:

1746

2034

server_settings[option] = value

1758

2046

debuglevel = server_settings["debuglevel"]

1759

2047

use_dbus = server_settings["use_dbus"]

1760

2048

use_ipv6 = server_settings["use_ipv6"]

1761

2049

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

2050

stored_state_file)

2051

2052

if debug:

2053

initlogger(logging.DEBUG)

2054

else:

2055

if not debuglevel:

2056

initlogger()

2057

else:

2058

level = getattr(logging, debuglevel.upper())

2059

initlogger(level)

2060

1762

2061

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

1763

2062

syslogger.setFormatter(logging.Formatter

1764

2063

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

1766

2065

% server_settings["servicename"]))

1767

2066

1768

2067

# Parse config file with clients

1769

client_defaults = { "timeout": "1h",

1770

"interval": "5m",

2068

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

2069

"extended_timeout": "15m",

2070

"interval": "2m",

1771

2071

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

1772

2072

"host": "",

1773

2073

"approval_delay": "0s",

1813

2113

try:

1814

2114

os.setgid(gid)

1815

2115

os.setuid(uid)

1816

except OSError, error:

2116

except OSError as error:

1817

2117

if error[0] != errno.EPERM:

1818

2118

raise error

1819

2119

1820

if not debug and not debuglevel:

1821

syslogger.setLevel(logging.WARNING)

1822

console.setLevel(logging.WARNING)

1823

if debuglevel:

1824

level = getattr(logging, debuglevel.upper())

1825

syslogger.setLevel(level)

1826

console.setLevel(level)

1827

1828

2120

if debug:

1829

2121

# Enable all possible GnuTLS debugging

1830

2122

1861

2153

# End of Avahi example code

1862

2154

if use_dbus:

1863

2155

try:

1864

bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",

2156

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

1865

2157

bus, do_not_queue=True)

1866

except dbus.exceptions.NameExistsException, e:

2158

old_bus_name = (dbus.service.BusName

2159

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

2160

do_not_queue=True))

2161

except dbus.exceptions.NameExistsException as e:

1867

2162

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

1868

2163

use_dbus = False

1869

2164

server_settings["use_dbus"] = False

1870

2165

tcp_server.use_dbus = False

1871

2166

protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET

1872

service = AvahiService(name = server_settings["servicename"],

1873

servicetype = "_mandos._tcp",

1874

protocol = protocol, bus = bus)

2167

service = AvahiServiceToSyslog(name =

2168

server_settings["servicename"],

2169

servicetype = "_mandos._tcp",

2170

protocol = protocol, bus = bus)

1875

2171

if server_settings["interface"]:

1876

2172

service.interface = (if_nametoindex

1877

2173

(str(server_settings["interface"])))

1881

2177

1882

2178

client_class = Client

1883

2179

if use_dbus:

1884

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

1885

def client_config_items(config, section):

1886

special_settings = {

1887

"approved_by_default":

1888

lambda: config.getboolean(section,

1889

"approved_by_default"),

1890

}

1891

for name, value in config.items(section):

2180

client_class = functools.partial(ClientDBusTransitional,

2181

bus = bus)

2182

2183

special_settings = {

2184

# Some settings need to be accessd by special methods;

2185

# booleans need .getboolean(), etc. Here is a list of them:

2186

"approved_by_default":

2187

lambda section:

2188

client_config.getboolean(section, "approved_by_default"),

2189

"enabled":

2190

lambda section:

2191

client_config.getboolean(section, "enabled"),

2192

}

2193

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

2194

# { client_name: {setting_name: value, ...}, ...}

2195

# with exceptions for any special settings as defined above

2196

client_settings = dict((clientname,

2197

dict((setting,

2198

(value

2199

if setting not in special_settings

2200

else special_settings[setting]

2201

(clientname)))

2202

for setting, value in

2203

client_config.items(clientname)))

2204

for clientname in client_config.sections())

2205

2206

old_client_settings = {}

2207

clients_data = []

2208

2209

# Get client data and settings from last running state.

2210

if server_settings["restore"]:

2211

try:

2212

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

2213

clients_data, old_client_settings = (pickle.load

2214

(stored_state))

2215

os.remove(stored_state_path)

2216

except IOError as e:

2217

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

2218

.format(e))

2219

if e.errno != errno.ENOENT:

2220

raise

2221

2222

with PGPEngine() as pgp:

2223

for client in clients_data:

2224

client_name = client["name"]

2225

2226

# Decide which value to use after restoring saved state.

2227

# We have three different values: Old config file,

2228

# new config file, and saved state.

2229

# New config value takes precedence if it differs from old

2230

# config value, otherwise use saved state.

2231

for name, value in client_settings[client_name].items():

2232

try:

2233

# For each value in new config, check if it

2234

# differs from the old config value (Except for

2235

# the "secret" attribute)

2236

if (name != "secret" and

2237

value != old_client_settings[client_name]

2238

[name]):

2239

setattr(client, name, value)

2240

except KeyError:

2241

pass

2242

2243

# Clients who has passed its expire date can still be

2244

# enabled if its last checker was sucessful. Clients

2245

# whose checker failed before we stored its state is

2246

# assumed to have failed all checkers during downtime.

2247

if client["enabled"] and client["last_checked_ok"]:

2248

if ((datetime.datetime.utcnow()

2249

- client["last_checked_ok"])

2250

> client["interval"]):

2251

if client["last_checker_status"] != 0:

2252

client["enabled"] = False

2253

else:

2254

client["expires"] = (datetime.datetime

2255

.utcnow()

2256

+ client["timeout"])

2257

2258

client["changedstate"] = (multiprocessing_manager

2259

.Condition

2260

(multiprocessing_manager

2261

.Lock()))

2262

if use_dbus:

2263

new_client = (ClientDBusTransitional.__new__

2264

(ClientDBusTransitional))

2265

tcp_server.clients[client_name] = new_client

2266

new_client.bus = bus

2267

for name, value in client.iteritems():

2268

setattr(new_client, name, value)

2269

client_object_name = unicode(client_name).translate(

2270

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

2271

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

2272

new_client.dbus_object_path = (dbus.ObjectPath

2273

("/clients/"

2274

+ client_object_name))

2275

DBusObjectWithProperties.__init__(new_client,

2276

new_client.bus,

2277

new_client

2278

.dbus_object_path)

2279

else:

2280

tcp_server.clients[client_name] = (Client.__new__

2281

(Client))

2282

for name, value in client.iteritems():

2283

setattr(tcp_server.clients[client_name],

2284

name, value)

2285

1892

2286

try:

1893

yield (name, special_settings[name]())

1894

except KeyError:

1895

yield (name, value)

1896

1897

tcp_server.clients.update(set(

1898

client_class(name = section,

1899

config= dict(client_config_items(

1900

client_config, section)))

1901

for section in client_config.sections()))

2287

tcp_server.clients[client_name].secret = (

2288

pgp.decrypt(tcp_server.clients[client_name]

2289

.encrypted_secret,

2290

client_settings[client_name]

2291

["secret"]))

2292

except PGPError:

2293

# If decryption fails, we use secret from new settings

2294

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

2295

.format(client_name))

2296

tcp_server.clients[client_name].secret = (

2297

client_settings[client_name]["secret"])

2298

2299

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

2300

for clientname in set(old_client_settings) - set(client_settings):

2301

del tcp_server.clients[clientname]

2302

for clientname in set(client_settings) - set(old_client_settings):

2303

tcp_server.clients[clientname] = (client_class(name

2304

= clientname,

2305

config =

2306

client_settings

2307

[clientname]))

2308

1902

2309

if not tcp_server.clients:

1903

2310

logger.warning("No clients defined")

1904

2311

1917

2324

del pidfilename

1918

2325

1919

2326

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

1920

2327

1921

2328

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

1922

2329

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

1923

2330

1926

2333

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

1927

2334

def __init__(self):

1928

2335

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

1929

_interface = "se.bsnet.fukt.Mandos"

2336

_interface = "se.recompile.Mandos"

1930

2337

1931

2338

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

1932

2339

def ClientAdded(self, objpath):

1947

2354

def GetAllClients(self):

1948

2355

"D-Bus method"

1949

2356

return dbus.Array(c.dbus_object_path

1950

for c in tcp_server.clients)

2357

for c in

2358

tcp_server.clients.itervalues())

1951

2359

1952

2360

@dbus.service.method(_interface,

1953

2361

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

1955

2363

"D-Bus method"

1956

2364

return dbus.Dictionary(

1957

2365

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

1958

for c in tcp_server.clients),

2366

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

1959

2367

signature="oa{sv}")

1960

2368

1961

2369

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

1962

2370

def RemoveClient(self, object_path):

1963

2371

"D-Bus method"

1964

for c in tcp_server.clients:

2372

for c in tcp_server.clients.itervalues():

1965

2373

if c.dbus_object_path == object_path:

1966

tcp_server.clients.remove(c)

2374

del tcp_server.clients[c.name]

1967

2375

c.remove_from_connection()

1968

2376

# Don't signal anything except ClientRemoved

1969

2377

c.disable(quiet=True)

1974

2382

1975

2383

del _interface

1976

2384

1977

mandos_dbus_service = MandosDBusService()

2385

class MandosDBusServiceTransitional(MandosDBusService):

2386

__metaclass__ = AlternateDBusNamesMetaclass

2387

mandos_dbus_service = MandosDBusServiceTransitional()

1978

2388

1979

2389

def cleanup():

1980

2390

"Cleanup function; run on exit"

1981

2391

service.cleanup()

1982

2392

2393

multiprocessing.active_children()

2394

if not (tcp_server.clients or client_settings):

2395

return

2396

2397

# Store client before exiting. Secrets are encrypted with key

2398

# based on what config file has. If config file is

2399

# removed/edited, old secret will thus be unrecovable.

2400

clients = []

2401

with PGPEngine() as pgp:

2402

for client in tcp_server.clients.itervalues():

2403

key = client_settings[client.name]["secret"]

2404

client.encrypted_secret = pgp.encrypt(client.secret,

2405

key)

2406

client_dict = {}

2407

2408

# A list of attributes that will not be stored when

2409

# shutting down.

2410

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

2411

for name, typ in (inspect.getmembers

2412

(dbus.service.Object)):

2413

exclude.add(name)

2414

2415

client_dict["encrypted_secret"] = (client

2416

.encrypted_secret)

2417

for attr in client.client_structure:

2418

if attr not in exclude:

2419

client_dict[attr] = getattr(client, attr)

2420

2421

clients.append(client_dict)

2422

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

2423

2424

try:

2425

with os.fdopen(os.open(stored_state_path,

2426

os.O_CREAT|os.O_WRONLY|os.O_TRUNC,

2427

0600), "wb") as stored_state:

2428

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

2429

except (IOError, OSError) as e:

2430

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

2431

.format(e))

2432

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

2433

raise

2434

2435

# Delete all clients, and settings from config

1983

2436

while tcp_server.clients:

1984

client = tcp_server.clients.pop()

2437

name, client = tcp_server.clients.popitem()

1985

2438

if use_dbus:

1986

2439

client.remove_from_connection()

1987

client.disable_hook = None

1988

2440

# Don't signal anything except ClientRemoved

1989

2441

client.disable(quiet=True)

1990

2442

if use_dbus:

1991

2443

# Emit D-Bus signal

1992

mandos_dbus_service.ClientRemoved(client.dbus_object_path,

2444

mandos_dbus_service.ClientRemoved(client

2445

.dbus_object_path,

1993

2446

client.name)

2447

client_settings.clear()

1994

2448

1995

2449

atexit.register(cleanup)

1996

2450

1997

for client in tcp_server.clients:

2451

for client in tcp_server.clients.itervalues():

1998

2452

if use_dbus:

1999

2453

# Emit D-Bus signal

2000

2454

mandos_dbus_service.ClientAdded(client.dbus_object_path)

2001

client.enable()

2455

# Need to initiate checking of clients

2456

if client.enabled:

2457

client.init_checker()

2002

2458

2003

2459

tcp_server.enable()

2004

2460

tcp_server.server_activate()

2019

2475

# From the Avahi example code

2020

2476

try:

2021

2477

service.activate()

2022

except dbus.exceptions.DBusException, error:

2478

except dbus.exceptions.DBusException as error:

2023

2479

logger.critical("DBusException: %s", error)

2024

2480

cleanup()

2025

2481

sys.exit(1)

2032

2488

2033

2489

logger.debug("Starting main loop")

2034

2490

main_loop.run()

2035

except AvahiError, error:

2491

except AvahiError as error:

2036

2492

logger.critical("AvahiError: %s", error)

2037

2493

cleanup()

2038

2494

sys.exit(1)

2044

2500

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

2045

2501

cleanup()

2046

2502

2503

2047

2504

if __name__ == '__main__':

2048

2505

main()