/mandos/trunk : revision 734

11

# "AvahiService" class, and some lines in "main".

12

#

13

# Everything else is

14

15

14

15

16

#

17

# This program is free software: you can redistribute it and/or modify

18

# it under the terms of the GNU General Public License as published by

36

37

from future_builtins import *

38

39

try:

40

import SocketServer as socketserver

41

except ImportError:

42

import socketserver

39

import SocketServer as socketserver

43

40

import socket

44

41

import argparse

45

42

import datetime

50

47

import gnutls.library.functions

51

48

import gnutls.library.constants

52

49

import gnutls.library.types

53

try:

54

import ConfigParser as configparser

55

except ImportError:

56

import configparser

50

import ConfigParser as configparser

57

51

import sys

58

52

import re

59

53

import os

68

62

import struct

69

63

import fcntl

70

64

import functools

71

try:

72

import cPickle as pickle

73

except ImportError:

74

import pickle

65

import cPickle as pickle

75

66

import multiprocessing

76

67

import types

77

68

import binascii

78

69

import tempfile

79

70

import itertools

80

71

import collections

81

import codecs

82

72

83

73

import dbus

84

74

import dbus.service

85

try:

86

import gobject

87

except ImportError:

88

from gi.repository import GObject as gobject

75

import gobject

89

76

import avahi

90

77

from dbus.mainloop.glib import DBusGMainLoop

91

78

import ctypes

104

91

if sys.version_info.major == 2:

105

92

str = unicode

106

93

107

version = "1.6.9"

94

version = "1.6.8"

108

95

stored_state_file = "clients.pickle"

109

96

110

97

logger = logging.getLogger()

111

98

syslogger = None

112

99

113

100

try:

114

if_nametoindex = ctypes.cdll.LoadLibrary(

115

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

101

if_nametoindex = (ctypes.cdll.LoadLibrary

102

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

103

.if_nametoindex)

116

104

except (OSError, AttributeError):

117

118

105

def if_nametoindex(interface):

119

106

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

120

107

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

129

116

"""init logger and add loglevel"""

130

117

131

118

global syslogger

132

syslogger = (logging.handlers.SysLogHandler(

133

facility = logging.handlers.SysLogHandler.LOG_DAEMON,

134

address = "/dev/log"))

119

syslogger = (logging.handlers.SysLogHandler

120

(facility =

121

logging.handlers.SysLogHandler.LOG_DAEMON,

122

address = "/dev/log"))

135

123

syslogger.setFormatter(logging.Formatter

136

124

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

137

125

' %(message)s'))

154

142

155

143

class PGPEngine(object):

156

144

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

157

158

145

def __init__(self):

159

146

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

160

147

self.gnupgargs = ['--batch',

199

186

200

187

def encrypt(self, data, password):

201

188

passphrase = self.password_encode(password)

202

with tempfile.NamedTemporaryFile(

203

dir=self.tempdir) as passfile:

189

with tempfile.NamedTemporaryFile(dir=self.tempdir

190

) as passfile:

204

191

passfile.write(passphrase)

205

192

passfile.flush()

206

193

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

217

204

218

205

def decrypt(self, data, password):

219

206

passphrase = self.password_encode(password)

220

with tempfile.NamedTemporaryFile(

221

dir = self.tempdir) as passfile:

207

with tempfile.NamedTemporaryFile(dir = self.tempdir

208

) as passfile:

222

209

passfile.write(passphrase)

223

210

passfile.flush()

224

211

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

228

215

stdin = subprocess.PIPE,

229

216

stdout = subprocess.PIPE,

230

217

stderr = subprocess.PIPE)

231

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

218

decrypted_plaintext, err = proc.communicate(input

219

= data)

232

220

if proc.returncode != 0:

233

221

raise PGPError(err)

234

222

return decrypted_plaintext

240

228

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

241

229

**kwargs)

242

230

243

244

231

class AvahiServiceError(AvahiError):

245

232

pass

246

233

247

248

234

class AvahiGroupError(AvahiError):

249

235

pass

250

236

270

256

bus: dbus.SystemBus()

271

257

"""

272

258

273

def __init__(self,

274

interface = avahi.IF_UNSPEC,

275

name = None,

276

servicetype = None,

277

port = None,

278

TXT = None,

279

domain = "",

280

host = "",

281

max_renames = 32768,

282

protocol = avahi.PROTO_UNSPEC,

283

bus = None):

259

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

260

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

261

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

262

protocol = avahi.PROTO_UNSPEC, bus = None):

284

263

self.interface = interface

285

264

self.name = name

286

265

self.type = servicetype

296

275

self.bus = bus

297

276

self.entry_group_state_changed_match = None

298

277

299

def rename(self, remove=True):

278

def rename(self):

300

279

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

301

280

if self.rename_count >= self.max_renames:

302

281

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

303

282

" after %i retries, exiting.",

304

283

self.rename_count)

305

284

raise AvahiServiceError("Too many renames")

306

self.name = str(

307

self.server.GetAlternativeServiceName(self.name))

308

self.rename_count += 1

285

self.name = str(self.server

286

.GetAlternativeServiceName(self.name))

309

287

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

310

288

self.name)

311

if remove:

312

self.remove()

289

self.remove()

313

290

try:

314

291

self.add()

315

292

except dbus.exceptions.DBusException as error:

316

if (error.get_dbus_name()

317

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

318

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

319

return self.rename(remove=False)

320

else:

321

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

322

self.cleanup()

323

os._exit(1)

293

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

294

self.cleanup()

295

os._exit(1)

296

self.rename_count += 1

324

297

325

298

def remove(self):

326

299

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

365

338

elif state == avahi.ENTRY_GROUP_FAILURE:

366

339

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

367

340

str(error))

368

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

341

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

342

.format(error))

369

343

370

344

def cleanup(self):

371

345

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

381

355

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

382

356

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

383

357

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

384

bad_states = {

385

avahi.SERVER_INVALID: "Zeroconf server invalid",

386

avahi.SERVER_REGISTERING: None,

387

avahi.SERVER_COLLISION: "Zeroconf server name collision",

388

avahi.SERVER_FAILURE: "Zeroconf server failure",

389

}

358

bad_states = { avahi.SERVER_INVALID:

359

"Zeroconf server invalid",

360

avahi.SERVER_REGISTERING: None,

361

avahi.SERVER_COLLISION:

362

"Zeroconf server name collision",

363

avahi.SERVER_FAILURE:

364

"Zeroconf server failure" }

390

365

if state in bad_states:

391

366

if bad_states[state] is not None:

392

367

if error is None:

411

386

follow_name_owner_changes=True),

412

387

avahi.DBUS_INTERFACE_SERVER)

413

388

self.server.connect_to_signal("StateChanged",

414

self.server_state_changed)

389

self.server_state_changed)

415

390

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

416

391

417

392

418

393

class AvahiServiceToSyslog(AvahiService):

419

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

394

def rename(self):

420

395

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

421

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

422

syslogger.setFormatter(logging.Formatter(

423

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

424

.format(self.name)))

396

ret = AvahiService.rename(self)

397

syslogger.setFormatter(logging.Formatter

398

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

399

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

400

.format(self.name)))

425

401

return ret

426

402

427

def call_pipe(connection, # : multiprocessing.Connection

428

func, *args, **kwargs):

429

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

430

431

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

432

return value on the provided multiprocessing.Connection.

433

"""

434

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

435

connection.close()

436

403

437

404

class Client(object):

438

405

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

465

432

last_checker_status: integer between 0 and 255 reflecting exit

466

433

status of last checker. -1 reflects crashed

467

434

checker, -2 means no checker completed yet.

468

last_checker_signal: The signal which killed the last checker, if

469

last_checker_status is -1

470

435

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

471

436

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

472

437

D-Bus identifiers

485

450

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

486

451

"last_approval_request", "last_checked_ok",

487

452

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

488

client_defaults = {

489

"timeout": "PT5M",

490

"extended_timeout": "PT15M",

491

"interval": "PT2M",

492

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

493

"host": "",

494

"approval_delay": "PT0S",

495

"approval_duration": "PT1S",

496

"approved_by_default": "True",

497

"enabled": "True",

498

}

453

client_defaults = { "timeout": "PT5M",

454

"extended_timeout": "PT15M",

455

"interval": "PT2M",

456

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

457

"host": "",

458

"approval_delay": "PT0S",

459

"approval_duration": "PT1S",

460

"approved_by_default": "True",

461

"enabled": "True",

462

}

499

463

500

464

@staticmethod

501

465

def config_parser(config):

517

481

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

518

482

"enabled")

519

483

520

# Uppercase and remove spaces from fingerprint for later

521

# comparison purposes with return value from the

522

# fingerprint() function

523

484

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

524

485

.replace(" ", ""))

525

486

if "secret" in section:

567

528

self.expires = None

568

529

569

530

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

531

# Uppercase and remove spaces from fingerprint for later

532

# comparison purposes with return value from the fingerprint()

533

# function

570

534

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

571

535

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

572

536

datetime.datetime.utcnow())

579

543

self.current_checker_command = None

580

544

self.approved = None

581

545

self.approvals_pending = 0

582

self.changedstate = multiprocessing_manager.Condition(

583

multiprocessing_manager.Lock())

584

self.client_structure = [attr

585

for attr in self.__dict__.iterkeys()

546

self.changedstate = (multiprocessing_manager

547

.Condition(multiprocessing_manager

548

.Lock()))

549

self.client_structure = [attr for attr in

550

self.__dict__.iterkeys()

586

551

if not attr.startswith("_")]

587

552

self.client_structure.append("client_structure")

588

553

589

for name, t in inspect.getmembers(

590

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

554

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

555

lambda obj:

556

isinstance(obj,

557

property)):

591

558

if not name.startswith("_"):

592

559

self.client_structure.append(name)

593

560

635

602

# and every interval from then on.

636

603

if self.checker_initiator_tag is not None:

637

604

gobject.source_remove(self.checker_initiator_tag)

638

self.checker_initiator_tag = gobject.timeout_add(

639

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

640

self.start_checker)

605

self.checker_initiator_tag = (gobject.timeout_add

606

(int(self.interval

607

.total_seconds() * 1000),

608

self.start_checker))

641

609

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

642

610

if self.disable_initiator_tag is not None:

643

611

gobject.source_remove(self.disable_initiator_tag)

644

self.disable_initiator_tag = gobject.timeout_add(

645

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

612

self.disable_initiator_tag = (gobject.timeout_add

613

(int(self.timeout

614

.total_seconds() * 1000),

615

self.disable))

646

616

# Also start a new checker *right now*.

647

617

self.start_checker()

648

618

649

def checker_callback(self, source, condition, connection,

650

command):

619

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

651

620

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

652

621

self.checker_callback_tag = None

653

622

self.checker = None

654

# Read return code from connection (see call_pipe)

655

returncode = connection.recv()

656

connection.close()

657

658

if returncode >= 0:

659

self.last_checker_status = returncode

660

self.last_checker_signal = None

623

if os.WIFEXITED(condition):

624

self.last_checker_status = os.WEXITSTATUS(condition)

661

625

if self.last_checker_status == 0:

662

626

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

663

627

vars(self))

664

628

self.checked_ok()

665

629

else:

666

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

630

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

631

vars(self))

667

632

else:

668

633

self.last_checker_status = -1

669

self.last_checker_signal = -returncode

670

634

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

671

635

vars(self))

672

return False

673

636

674

637

def checked_ok(self):

675

638

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

676

639

self.last_checked_ok = datetime.datetime.utcnow()

677

640

self.last_checker_status = 0

678

self.last_checker_signal = None

679

641

self.bump_timeout()

680

642

681

643

def bump_timeout(self, timeout=None):

686

648

gobject.source_remove(self.disable_initiator_tag)

687

649

self.disable_initiator_tag = None

688

650

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

689

self.disable_initiator_tag = gobject.timeout_add(

690

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

651

self.disable_initiator_tag = (gobject.timeout_add

652

(int(timeout.total_seconds()

653

* 1000), self.disable))

691

654

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

692

655

693

656

def need_approval(self):

707

670

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

708

671

# should be.

709

672

710

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

711

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

712

self.checker.join()

713

self.checker = None

673

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

674

try:

675

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

676

except AttributeError:

677

pass

678

except OSError as error:

679

if error.errno != errno.ECHILD:

680

raise

681

else:

682

if pid:

683

logger.warning("Checker was a zombie")

684

gobject.source_remove(self.checker_callback_tag)

685

self.checker_callback(pid, status,

686

self.current_checker_command)

714

687

# Start a new checker if needed

715

688

if self.checker is None:

716

689

# Escape attributes for the shell

717

escaped_attrs = {

718

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

719

for attr in self.runtime_expansions }

690

escaped_attrs = { attr:

691

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

692

for attr in self.runtime_expansions }

720

693

try:

721

694

command = self.checker_command % escaped_attrs

722

695

except TypeError as error:

723

696

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

724

self.checker_command,

697

self.checker_command, exc_info=error)

698

return True # Try again later

699

self.current_checker_command = command

700

try:

701

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

702

command, self.name)

703

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

704

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

705

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

706

# always replaced by /dev/null.)

707

# The exception is when not debugging but nevertheless

708

# running in the foreground; use the previously

709

# created wnull.

710

popen_args = {}

711

if (not self.server_settings["debug"]

712

and self.server_settings["foreground"]):

713

popen_args.update({"stdout": wnull,

714

"stderr": wnull })

715

self.checker = subprocess.Popen(command,

716

close_fds=True,

717

shell=True, cwd="/",

718

**popen_args)

719

except OSError as error:

720

logger.error("Failed to start subprocess",

725

721

exc_info=error)

726

return True # Try again later

727

self.current_checker_command = command

728

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

729

self.name)

730

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

731

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

732

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

733

# always replaced by /dev/null.)

734

# The exception is when not debugging but nevertheless

735

# running in the foreground; use the previously

736

# created wnull.

737

popen_args = { "close_fds": True,

738

"shell": True,

739

"cwd": "/" }

740

if (not self.server_settings["debug"]

741

and self.server_settings["foreground"]):

742

popen_args.update({"stdout": wnull,

743

"stderr": wnull })

744

pipe = multiprocessing.Pipe(duplex = False)

745

self.checker = multiprocessing.Process(

746

target = call_pipe,

747

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

748

kwargs = popen_args)

749

self.checker.start()

750

self.checker_callback_tag = gobject.io_add_watch(

751

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

752

self.checker_callback, pipe[0], command)

722

return True

723

self.checker_callback_tag = (gobject.child_watch_add

724

(self.checker.pid,

725

self.checker_callback,

726

data=command))

727

# The checker may have completed before the gobject

728

# watch was added. Check for this.

729

try:

730

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

731

except OSError as error:

732

if error.errno == errno.ECHILD:

733

# This should never happen

734

logger.error("Child process vanished",

735

exc_info=error)

736

return True

737

raise

738

if pid:

739

gobject.source_remove(self.checker_callback_tag)

740

self.checker_callback(pid, status, command)

753

741

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

754

742

return True

755

743

761

749

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

762

750

return

763

751

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

764

self.checker.terminate()

752

try:

753

self.checker.terminate()

754

#time.sleep(0.5)

755

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

756

# self.checker.kill()

757

except OSError as error:

758

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

759

raise

765

760

self.checker = None

766

761

767

762

768

def dbus_service_property(dbus_interface,

769

signature="v",

770

access="readwrite",

771

byte_arrays=False):

763

def dbus_service_property(dbus_interface, signature="v",

764

access="readwrite", byte_arrays=False):

772

765

"""Decorators for marking methods of a DBusObjectWithProperties to

773

766

become properties on the D-Bus.

774

767

784

777

if byte_arrays and signature != "ay":

785

778

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

786

779

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

787

788

780

def decorator(func):

789

781

func._dbus_is_property = True

790

782

func._dbus_interface = dbus_interface

795

787

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

796

788

func._dbus_get_args_options = {'byte_arrays': byte_arrays }

797

789

return func

798

799

790

return decorator

800

791

801

792

810

801

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

811

802

"false"}

812

803

"""

813

814

804

def decorator(func):

815

805

func._dbus_is_interface = True

816

806

func._dbus_interface = dbus_interface

817

807

func._dbus_name = dbus_interface

818

808

return func

819

820

809

return decorator

821

810

822

811

832

821

def Property_dbus_property(self):

833

822

return dbus.Boolean(False)

834

823

"""

835

836

824

def decorator(func):

837

825

func._dbus_annotations = annotations

838

826

return func

839

840

827

return decorator

841

828

842

829

845

832

"""

846

833

pass

847

834

848

849

835

class DBusPropertyAccessException(DBusPropertyException):

850

836

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

851

837

"""

879

865

def _get_all_dbus_things(self, thing):

880

866

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

881

867

"""

882

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

868

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

869

name),

883

870

athing.__get__(self))

884

871

for cls in self.__class__.__mro__

885

872

for name, athing in

886

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

873

inspect.getmembers(cls,

874

self._is_dbus_thing(thing)))

887

875

888

876

def _get_dbus_property(self, interface_name, property_name):

889

877

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

890

878

property with the specified name and interface.

891

879

"""

892

for cls in self.__class__.__mro__:

893

for name, value in inspect.getmembers(

894

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

880

for cls in self.__class__.__mro__:

881

for name, value in (inspect.getmembers

882

(cls,

883

self._is_dbus_thing("property"))):

895

884

if (value._dbus_name == property_name

896

885

and value._dbus_interface == interface_name):

897

886

return value.__get__(self)

898

887

899

888

# No such property

900

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

901

self.dbus_object_path, interface_name, property_name))

889

raise DBusPropertyNotFound(self.dbus_object_path + ":"

890

+ interface_name + "."

891

+ property_name)

902

892

903

@dbus.service.method(dbus.PROPERTIES_IFACE,

904

in_signature="ss",

893

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

905

894

out_signature="v")

906

895

def Get(self, interface_name, property_name):

907

896

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

932

921

for byte in value))

933

922

prop(value)

934

923

935

@dbus.service.method(dbus.PROPERTIES_IFACE,

936

in_signature="s",

924

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

937

925

out_signature="a{sv}")

938

926

def GetAll(self, interface_name):

939

927

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

954

942

if not hasattr(value, "variant_level"):

955

943

properties[name] = value

956

944

continue

957

properties[name] = type(value)(

958

value, variant_level = value.variant_level + 1)

945

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

946

value.variant_level+1)

959

947

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

960

948

961

949

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

979

967

connection)

980

968

try:

981

969

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

982

983

970

def make_tag(document, name, prop):

984

971

e = document.createElement("property")

985

972

e.setAttribute("name", name)

986

973

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

987

974

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

988

975

return e

989

990

976

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

991

977

# Add property tags

992

978

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

1004

990

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

1005

991

and prop._dbus_interface

1006

992

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

1007

annots.update(getattr(

1008

prop, "_dbus_annotations", {}))

993

annots.update(getattr

994

(prop,

995

"_dbus_annotations",

996

{}))

1009

997

for name, value in annots.items():

1010

998

ann_tag = document.createElement(

1011

999

"annotation")

1016

1004

for annotation, value in dict(

1017

1005

itertools.chain.from_iterable(

1018

1006

annotations().items()

1019

for name, annotations

1020

in self._get_all_dbus_things("interface")

1007

for name, annotations in

1008

self._get_all_dbus_things("interface")

1021

1009

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

1022

1010

)).items():

1023

1011

ann_tag = document.createElement("annotation")

1052

1040

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

1053

1041

if dt is None:

1054

1042

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

1055

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

1043

return dbus.String(dt.isoformat(),

1044

variant_level=variant_level)

1056

1045

1057

1046

1058

1047

def alternate_dbus_interfaces(alt_interface_names, deprecate=True):

1078

1067

(from DBusObjectWithProperties) and interfaces (from the

1079

1068

dbus_interface_annotations decorator).

1080

1069

"""

1081

1082

1070

def wrapper(cls):

1083

1071

for orig_interface_name, alt_interface_name in (

1084

alt_interface_names.items()):

1072

alt_interface_names.items()):

1085

1073

attr = {}

1086

1074

interface_names = set()

1087

1075

# Go though all attributes of the class

1089

1077

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

1090

1078

# with the wrong interface name

1091

1079

if (not hasattr(attribute, "_dbus_interface")

1092

or not attribute._dbus_interface.startswith(

1093

orig_interface_name)):

1080

or not attribute._dbus_interface

1081

.startswith(orig_interface_name)):

1094

1082

continue

1095

1083

# Create an alternate D-Bus interface name based on

1096

1084

# the current name

1097

alt_interface = attribute._dbus_interface.replace(

1098

orig_interface_name, alt_interface_name)

1085

alt_interface = (attribute._dbus_interface

1086

.replace(orig_interface_name,

1087

alt_interface_name))

1099

1088

interface_names.add(alt_interface)

1100

1089

# Is this a D-Bus signal?

1101

1090

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

1102

if sys.version_info.major == 2:

1103

# Extract the original non-method undecorated

1104

# function by black magic

1105

nonmethod_func = (dict(

1091

# Extract the original non-method undecorated

1092

# function by black magic

1093

nonmethod_func = (dict(

1106

1094

zip(attribute.func_code.co_freevars,

1107

attribute.__closure__))

1108

["func"].cell_contents)

1109

else:

1110

nonmethod_func = attribute

1095

attribute.__closure__))["func"]

1096

.cell_contents)

1111

1097

# Create a new, but exactly alike, function

1112

1098

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

1113

1099

# with the alternate D-Bus interface name

1114

if sys.version_info.major == 2:

1115

new_function = types.FunctionType(

1116

nonmethod_func.func_code,

1117

nonmethod_func.func_globals,

1118

nonmethod_func.func_name,

1119

nonmethod_func.func_defaults,

1120

nonmethod_func.func_closure)

1121

else:

1122

new_function = types.FunctionType(

1123

nonmethod_func.__code__,

1124

nonmethod_func.__globals__,

1125

nonmethod_func.__name__,

1126

nonmethod_func.__defaults__,

1127

nonmethod_func.__closure__)

1128

new_function = (dbus.service.signal(

1129

alt_interface,

1130

attribute._dbus_signature)(new_function))

1100

new_function = (dbus.service.signal

1101

(alt_interface,

1102

attribute._dbus_signature)

1103

(types.FunctionType(

1104

nonmethod_func.func_code,

1105

nonmethod_func.func_globals,

1106

nonmethod_func.func_name,

1107

nonmethod_func.func_defaults,

1108

nonmethod_func.func_closure)))

1131

1109

# Copy annotations, if any

1132

1110

try:

1133

new_function._dbus_annotations = dict(

1134

attribute._dbus_annotations)

1111

new_function._dbus_annotations = (

1112

dict(attribute._dbus_annotations))

1135

1113

except AttributeError:

1136

1114

pass

1137

1115

# Define a creator of a function to call both the

1142

1120

"""This function is a scope container to pass

1143

1121

func1 and func2 to the "call_both" function

1144

1122

outside of its arguments"""

1145

1146

1123

def call_both(*args, **kwargs):

1147

1124

"""This function will emit two D-Bus

1148

1125

signals by calling func1 and func2"""

1149

1126

func1(*args, **kwargs)

1150

1127

func2(*args, **kwargs)

1151

1152

1128

return call_both

1153

1129

# Create the "call_both" function and add it to

1154

1130

# the class

1159

1135

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

1160

1136

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

1161

1137

# to the class.

1162

attr[attrname] = (

1163

dbus.service.method(

1164

alt_interface,

1165

attribute._dbus_in_signature,

1166

attribute._dbus_out_signature)

1167

(types.FunctionType(attribute.func_code,

1168

attribute.func_globals,

1169

attribute.func_name,

1170

attribute.func_defaults,

1171

attribute.func_closure)))

1138

attr[attrname] = (dbus.service.method

1139

(alt_interface,

1140

attribute._dbus_in_signature,

1141

attribute._dbus_out_signature)

1142

(types.FunctionType

1143

(attribute.func_code,

1144

attribute.func_globals,

1145

attribute.func_name,

1146

attribute.func_defaults,

1147

attribute.func_closure)))

1172

1148

# Copy annotations, if any

1173

1149

try:

1174

attr[attrname]._dbus_annotations = dict(

1175

attribute._dbus_annotations)

1150

attr[attrname]._dbus_annotations = (

1151

dict(attribute._dbus_annotations))

1176

1152

except AttributeError:

1177

1153

pass

1178

1154

# Is this a D-Bus property?

1181

1157

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

1182

1158

# property with the alternate D-Bus interface

1183

1159

# name. Add it to the class.

1184

attr[attrname] = (dbus_service_property(

1185

alt_interface, attribute._dbus_signature,

1186

attribute._dbus_access,

1187

attribute._dbus_get_args_options

1188

["byte_arrays"])

1189

(types.FunctionType(

1190

attribute.func_code,

1191

attribute.func_globals,

1192

attribute.func_name,

1193

attribute.func_defaults,

1194

attribute.func_closure)))

1160

attr[attrname] = (dbus_service_property

1161

(alt_interface,

1162

attribute._dbus_signature,

1163

attribute._dbus_access,

1164

attribute

1165

._dbus_get_args_options

1166

["byte_arrays"])

1167

(types.FunctionType

1168

(attribute.func_code,

1169

attribute.func_globals,

1170

attribute.func_name,

1171

attribute.func_defaults,

1172

attribute.func_closure)))

1195

1173

# Copy annotations, if any

1196

1174

try:

1197

attr[attrname]._dbus_annotations = dict(

1198

attribute._dbus_annotations)

1175

attr[attrname]._dbus_annotations = (

1176

dict(attribute._dbus_annotations))

1199

1177

except AttributeError:

1200

1178

pass

1201

1179

# Is this a D-Bus interface?

1204

1182

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

1205

1183

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

1206

1184

# to the class.

1207

attr[attrname] = (

1208

dbus_interface_annotations(alt_interface)

1209

(types.FunctionType(attribute.func_code,

1210

attribute.func_globals,

1211

attribute.func_name,

1212

attribute.func_defaults,

1213

attribute.func_closure)))

1185

attr[attrname] = (dbus_interface_annotations

1186

(alt_interface)

1187

(types.FunctionType

1188

(attribute.func_code,

1189

attribute.func_globals,

1190

attribute.func_name,

1191

attribute.func_defaults,

1192

attribute.func_closure)))

1214

1193

if deprecate:

1215

1194

# Deprecate all alternate interfaces

1216

1195

iname="_AlternateDBusNames_interface_annotation{}"

1217

1196

for interface_name in interface_names:

1218

1219

1197

@dbus_interface_annotations(interface_name)

1220

1198

def func(self):

1221

1199

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

1222

"true" }

1200

"true" }

1223

1201

# Find an unused name

1224

1202

for aname in (iname.format(i)

1225

1203

for i in itertools.count()):

1230

1208

# Replace the class with a new subclass of it with

1231

1209

# methods, signals, etc. as created above.

1232

1210

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

1233

(cls, ), attr)

1211

(cls,), attr)

1234

1212

return cls

1235

1236

1213

return wrapper

1237

1214

1238

1215

1239

1216

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

1240

"se.bsnet.fukt.Mandos"})

1217

"se.bsnet.fukt.Mandos"})

1241

1218

class ClientDBus(Client, DBusObjectWithProperties):

1242

1219

"""A Client class using D-Bus

1243

1220

1247

1224

"""

1248

1225

1249

1226

runtime_expansions = (Client.runtime_expansions

1250

+ ("dbus_object_path", ))

1227

+ ("dbus_object_path",))

1251

1228

1252

1229

_interface = "se.recompile.Mandos.Client"

1253

1230

1261

1238

client_object_name = str(self.name).translate(

1262

1239

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

1263

1240

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

1264

self.dbus_object_path = dbus.ObjectPath(

1265

"/clients/" + client_object_name)

1241

self.dbus_object_path = (dbus.ObjectPath

1242

("/clients/" + client_object_name))

1266

1243

DBusObjectWithProperties.__init__(self, self.bus,

1267

1244

self.dbus_object_path)

1268

1245

1269

def notifychangeproperty(transform_func, dbus_name,

1270

type_func=lambda x: x,

1271

variant_level=1,

1272

invalidate_only=False,

1246

def notifychangeproperty(transform_func,

1247

dbus_name, type_func=lambda x: x,

1248

variant_level=1, invalidate_only=False,

1273

1249

_interface=_interface):

1274

1250

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

1275

1251

its changes to DBus.

1282

1258

variant_level: D-Bus variant level. Default: 1

1283

1259

"""

1284

1260

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

1285

1286

1261

def setter(self, value):

1287

1262

if hasattr(self, "dbus_object_path"):

1288

1263

if (not hasattr(self, attrname) or

1289

1264

type_func(getattr(self, attrname, None))

1290

1265

!= type_func(value)):

1291

1266

if invalidate_only:

1292

self.PropertiesChanged(

1293

_interface, dbus.Dictionary(),

1294

dbus.Array((dbus_name, )))

1267

self.PropertiesChanged(_interface,

1268

dbus.Dictionary(),

1269

dbus.Array

1270

((dbus_name,)))

1295

1271

else:

1296

dbus_value = transform_func(

1297

type_func(value),

1298

variant_level = variant_level)

1272

dbus_value = transform_func(type_func(value),

1273

variant_level

1274

=variant_level)

1299

1275

self.PropertyChanged(dbus.String(dbus_name),

1300

1276

dbus_value)

1301

self.PropertiesChanged(

1302

_interface,

1303

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

1304

dbus_value }),

1305

dbus.Array())

1277

self.PropertiesChanged(_interface,

1278

dbus.Dictionary({

1279

dbus.String(dbus_name):

1280

dbus_value }), dbus.Array())

1306

1281

setattr(self, attrname, value)

1307

1282

1308

1283

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

1314

1289

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

1315

1290

last_enabled = notifychangeproperty(datetime_to_dbus,

1316

1291

"LastEnabled")

1317

checker = notifychangeproperty(

1318

dbus.Boolean, "CheckerRunning",

1319

type_func = lambda checker: checker is not None)

1292

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

1293

type_func = lambda checker:

1294

checker is not None)

1320

1295

last_checked_ok = notifychangeproperty(datetime_to_dbus,

1321

1296

"LastCheckedOK")

1322

1297

last_checker_status = notifychangeproperty(dbus.Int16,

1325

1300

datetime_to_dbus, "LastApprovalRequest")

1326

1301

approved_by_default = notifychangeproperty(dbus.Boolean,

1327

1302

"ApprovedByDefault")

1328

approval_delay = notifychangeproperty(

1329

dbus.UInt64, "ApprovalDelay",

1330

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

1303

approval_delay = notifychangeproperty(dbus.UInt64,

1304

"ApprovalDelay",

1305

type_func =

1306

lambda td: td.total_seconds()

1307

* 1000)

1331

1308

approval_duration = notifychangeproperty(

1332

1309

dbus.UInt64, "ApprovalDuration",

1333

1310

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

1334

1311

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

1335

timeout = notifychangeproperty(

1336

dbus.UInt64, "Timeout",

1337

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

1312

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

1313

type_func = lambda td:

1314

td.total_seconds() * 1000)

1338

1315

extended_timeout = notifychangeproperty(

1339

1316

dbus.UInt64, "ExtendedTimeout",

1340

1317

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

1341

interval = notifychangeproperty(

1342

dbus.UInt64, "Interval",

1343

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

1318

interval = notifychangeproperty(dbus.UInt64,

1319

"Interval",

1320

type_func =

1321

lambda td: td.total_seconds()

1322

* 1000)

1344

1323

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

1345

1324

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

1346

1325

invalidate_only=True)

1356

1335

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

1357

1336

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

1358

1337

1359

def checker_callback(self, source, condition,

1360

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

1361

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

1362

connection, command, *args,

1363

**kwargs)

1364

exitstatus = self.last_checker_status

1365

if exitstatus >= 0:

1338

def checker_callback(self, pid, condition, command,

1339

*args, **kwargs):

1340

self.checker_callback_tag = None

1341

self.checker = None

1342

if os.WIFEXITED(condition):

1343

exitstatus = os.WEXITSTATUS(condition)

1366

1344

# Emit D-Bus signal

1367

1345

self.CheckerCompleted(dbus.Int16(exitstatus),

1368

dbus.Int64(0),

1346

dbus.Int64(condition),

1369

1347

dbus.String(command))

1370

1348

else:

1371

1349

# Emit D-Bus signal

1372

1350

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

1373

dbus.Int64(

1374

self.last_checker_signal),

1351

dbus.Int64(condition),

1375

1352

dbus.String(command))

1376

return ret

1353

1354

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

1355

*args, **kwargs)

1377

1356

1378

1357

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

1379

1358

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

1484

1463

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

1485

1464

1486

1465

# ApprovedByDefault - property

1487

@dbus_service_property(_interface,

1488

signature="b",

1466

@dbus_service_property(_interface, signature="b",

1489

1467

access="readwrite")

1490

1468

def ApprovedByDefault_dbus_property(self, value=None):

1491

1469

if value is None: # get

1493

1471

self.approved_by_default = bool(value)

1494

1472

1495

1473

# ApprovalDelay - property

1496

@dbus_service_property(_interface,

1497

signature="t",

1474

@dbus_service_property(_interface, signature="t",

1498

1475

access="readwrite")

1499

1476

def ApprovalDelay_dbus_property(self, value=None):

1500

1477

if value is None: # get

1503

1480

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

1504

1481

1505

1482

# ApprovalDuration - property

1506

@dbus_service_property(_interface,

1507

signature="t",

1483

@dbus_service_property(_interface, signature="t",

1508

1484

access="readwrite")

1509

1485

def ApprovalDuration_dbus_property(self, value=None):

1510

1486

if value is None: # get

1523

1499

return dbus.String(self.fingerprint)

1524

1500

1525

1501

# Host - property

1526

@dbus_service_property(_interface,

1527

signature="s",

1502

@dbus_service_property(_interface, signature="s",

1528

1503

access="readwrite")

1529

1504

def Host_dbus_property(self, value=None):

1530

1505

if value is None: # get

1542

1517

return datetime_to_dbus(self.last_enabled)

1543

1518

1544

1519

# Enabled - property

1545

@dbus_service_property(_interface,

1546

signature="b",

1520

@dbus_service_property(_interface, signature="b",

1547

1521

access="readwrite")

1548

1522

def Enabled_dbus_property(self, value=None):

1549

1523

if value is None: # get

1554

1528

self.disable()

1555

1529

1556

1530

# LastCheckedOK - property

1557

@dbus_service_property(_interface,

1558

signature="s",

1531

@dbus_service_property(_interface, signature="s",

1559

1532

access="readwrite")

1560

1533

def LastCheckedOK_dbus_property(self, value=None):

1561

1534

if value is not None:

1564

1537

return datetime_to_dbus(self.last_checked_ok)

1565

1538

1566

1539

# LastCheckerStatus - property

1567

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

1540

@dbus_service_property(_interface, signature="n",

1541

access="read")

1568

1542

def LastCheckerStatus_dbus_property(self):

1569

1543

return dbus.Int16(self.last_checker_status)

1570

1544

1579

1553

return datetime_to_dbus(self.last_approval_request)

1580

1554

1581

1555

# Timeout - property

1582

@dbus_service_property(_interface,

1583

signature="t",

1556

@dbus_service_property(_interface, signature="t",

1584

1557

access="readwrite")

1585

1558

def Timeout_dbus_property(self, value=None):

1586

1559

if value is None: # get

1599

1572

is None):

1600

1573

return

1601

1574

gobject.source_remove(self.disable_initiator_tag)

1602

self.disable_initiator_tag = gobject.timeout_add(

1603

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

1604

self.disable)

1575

self.disable_initiator_tag = (

1576

gobject.timeout_add(

1577

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

1578

* 1000), self.disable))

1605

1579

1606

1580

# ExtendedTimeout - property

1607

@dbus_service_property(_interface,

1608

signature="t",

1581

@dbus_service_property(_interface, signature="t",

1609

1582

access="readwrite")

1610

1583

def ExtendedTimeout_dbus_property(self, value=None):

1611

1584

if value is None: # get

1614

1587

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

1615

1588

1616

1589

# Interval - property

1617

@dbus_service_property(_interface,

1618

signature="t",

1590

@dbus_service_property(_interface, signature="t",

1619

1591

access="readwrite")

1620

1592

def Interval_dbus_property(self, value=None):

1621

1593

if value is None: # get

1626

1598

if self.enabled:

1627

1599

# Reschedule checker run

1628

1600

gobject.source_remove(self.checker_initiator_tag)

1629

self.checker_initiator_tag = gobject.timeout_add(

1630

value, self.start_checker)

1631

self.start_checker() # Start one now, too

1601

self.checker_initiator_tag = (gobject.timeout_add

1602

(value, self.start_checker))

1603

self.start_checker() # Start one now, too

1632

1604

1633

1605

# Checker - property

1634

@dbus_service_property(_interface,

1635

signature="s",

1606

@dbus_service_property(_interface, signature="s",

1636

1607

access="readwrite")

1637

1608

def Checker_dbus_property(self, value=None):

1638

1609

if value is None: # get

1640

1611

self.checker_command = str(value)

1641

1612

1642

1613

# CheckerRunning - property

1643

@dbus_service_property(_interface,

1644

signature="b",

1614

@dbus_service_property(_interface, signature="b",

1645

1615

access="readwrite")

1646

1616

def CheckerRunning_dbus_property(self, value=None):

1647

1617

if value is None: # get

1657

1627

return self.dbus_object_path # is already a dbus.ObjectPath

1658

1628

1659

1629

# Secret = property

1660

@dbus_service_property(_interface,

1661

signature="ay",

1662

access="write",

1663

byte_arrays=True)

1630

@dbus_service_property(_interface, signature="ay",

1631

access="write", byte_arrays=True)

1664

1632

def Secret_dbus_property(self, value):

1665

1633

self.secret = bytes(value)

1666

1634

1672

1640

self._pipe = child_pipe

1673

1641

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

1674

1642

if not self._pipe.recv():

1675

raise KeyError(fpr)

1643

raise KeyError()

1676

1644

1677

1645

def __getattribute__(self, name):

1678

1646

if name == '_pipe':

1682

1650

if data[0] == 'data':

1683

1651

return data[1]

1684

1652

if data[0] == 'function':

1685

1686

1653

def func(*args, **kwargs):

1687

1654

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

1688

1655

return self._pipe.recv()[1]

1689

1690

1656

return func

1691

1657

1692

1658

def __setattr__(self, name, value):

1708

1674

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

1709

1675

self.server.child_pipe.fileno())

1710

1676

1711

session = gnutls.connection.ClientSession(

1712

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

1677

session = (gnutls.connection

1678

.ClientSession(self.request,

1679

gnutls.connection

1680

.X509Credentials()))

1713

1681

1714

1682

# Note: gnutls.connection.X509Credentials is really a

1715

1683

# generic GnuTLS certificate credentials object so long as

1724

1692

priority = self.server.gnutls_priority

1725

1693

if priority is None:

1726

1694

priority = "NORMAL"

1727

gnutls.library.functions.gnutls_priority_set_direct(

1728

session._c_object, priority, None)

1695

(gnutls.library.functions

1696

.gnutls_priority_set_direct(session._c_object,

1697

priority, None))

1729

1698

1730

1699

# Start communication using the Mandos protocol

1731

1700

# Get protocol number

1751

1720

approval_required = False

1752

1721

try:

1753

1722

try:

1754

fpr = self.fingerprint(

1755

self.peer_certificate(session))

1723

fpr = self.fingerprint(self.peer_certificate

1724

(session))

1756

1725

except (TypeError,

1757

1726

gnutls.errors.GNUTLSError) as error:

1758

1727

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

1773

1742

while True:

1774

1743

if not client.enabled:

1775

1744

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

1776

client.name)

1745

client.name)

1777

1746

if self.server.use_dbus:

1778

1747

# Emit D-Bus signal

1779

1748

client.Rejected("Disabled")

1826

1795

logger.warning("gnutls send failed",

1827

1796

exc_info=error)

1828

1797

return

1829

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

1830

len(client.secret) - (sent_size

1831

+ sent))

1798

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

1799

sent, len(client.secret)

1800

- (sent_size + sent))

1832

1801

sent_size += sent

1833

1802

1834

1803

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

1851

1820

def peer_certificate(session):

1852

1821

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

1853

1822

# If not an OpenPGP certificate...

1854

if (gnutls.library.functions.gnutls_certificate_type_get(

1855

session._c_object)

1823

if (gnutls.library.functions

1824

.gnutls_certificate_type_get(session._c_object)

1856

1825

!= gnutls.library.constants.GNUTLS_CRT_OPENPGP):

1857

1826

# ...do the normal thing

1858

1827

return session.peer_certificate

1872

1841

def fingerprint(openpgp):

1873

1842

"Convert an OpenPGP bytestring to a hexdigit fingerprint"

1874

1843

# New GnuTLS "datum" with the OpenPGP public key

1875

datum = gnutls.library.types.gnutls_datum_t(

1876

ctypes.cast(ctypes.c_char_p(openpgp),

1877

ctypes.POINTER(ctypes.c_ubyte)),

1878

ctypes.c_uint(len(openpgp)))

1844

datum = (gnutls.library.types

1845

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

1846

ctypes.POINTER

1847

(ctypes.c_ubyte)),

1848

ctypes.c_uint(len(openpgp))))

1879

1849

# New empty GnuTLS certificate

1880

1850

crt = gnutls.library.types.gnutls_openpgp_crt_t()

1881

gnutls.library.functions.gnutls_openpgp_crt_init(

1882

ctypes.byref(crt))

1851

(gnutls.library.functions

1852

.gnutls_openpgp_crt_init(ctypes.byref(crt)))

1883

1853

# Import the OpenPGP public key into the certificate

1884

gnutls.library.functions.gnutls_openpgp_crt_import(

1885

crt, ctypes.byref(datum),

1886

gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)

1854

(gnutls.library.functions

1855

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

1856

gnutls.library.constants

1857

.GNUTLS_OPENPGP_FMT_RAW))

1887

1858

# Verify the self signature in the key

1888

1859

crtverify = ctypes.c_uint()

1889

gnutls.library.functions.gnutls_openpgp_crt_verify_self(

1890

crt, 0, ctypes.byref(crtverify))

1860

(gnutls.library.functions

1861

.gnutls_openpgp_crt_verify_self(crt, 0,

1862

ctypes.byref(crtverify)))

1891

1863

if crtverify.value != 0:

1892

1864

gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)

1893

raise gnutls.errors.CertificateSecurityError(

1894

"Verify failed")

1865

raise (gnutls.errors.CertificateSecurityError

1866

("Verify failed"))

1895

1867

# New buffer for the fingerprint

1896

1868

buf = ctypes.create_string_buffer(20)

1897

1869

buf_len = ctypes.c_size_t()

1898

1870

# Get the fingerprint from the certificate into the buffer

1899

gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint(

1900

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

1871

(gnutls.library.functions

1872

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

1873

ctypes.byref(buf_len)))

1901

1874

# Deinit the certificate

1902

1875

gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)

1903

1876

# Convert the buffer to a Python bytestring

1909

1882

1910

1883

class MultiprocessingMixIn(object):

1911

1884

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

1912

1913

1885

def sub_process_main(self, request, address):

1914

1886

try:

1915

1887

self.finish_request(request, address)

1927

1899

1928

1900

class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):

1929

1901

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

1930

1931

1902

def process_request(self, request, client_address):

1932

1903

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

1933

1904

1954

1925

interface: None or a network interface name (string)

1955

1926

use_ipv6: Boolean; to use IPv6 or not

1956

1927

"""

1957

1958

1928

def __init__(self, server_address, RequestHandlerClass,

1959

interface=None,

1960

use_ipv6=True,

1961

socketfd=None):

1929

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

1962

1930

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

1963

1931

creating a new one with socket.socket().

1964

1932

"""

2005

1973

self.interface)

2006

1974

else:

2007

1975

try:

2008

self.socket.setsockopt(

2009

socket.SOL_SOCKET, SO_BINDTODEVICE,

2010

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

1976

self.socket.setsockopt(socket.SOL_SOCKET,

1977

SO_BINDTODEVICE,

1978

(self.interface + "\0")

1979

.encode("utf-8"))

2011

1980

except socket.error as error:

2012

1981

if error.errno == errno.EPERM:

2013

1982

logger.error("No permission to bind to"

2031

2000

self.server_address = (any_address,

2032

2001

self.server_address[1])

2033

2002

elif not self.server_address[1]:

2034

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

2003

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

2004

0)

2035

2005

# if self.interface:

2036

2006

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

2037

2007

# 0, # port

2051

2021

2052

2022

Assumes a gobject.MainLoop event loop.

2053

2023

"""

2054

2055

2024

def __init__(self, server_address, RequestHandlerClass,

2056

interface=None,

2057

use_ipv6=True,

2058

clients=None,

2059

gnutls_priority=None,

2060

use_dbus=True,

2061

socketfd=None):

2025

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

2026

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

2062

2027

self.enabled = False

2063

2028

self.clients = clients

2064

2029

if self.clients is None:

2070

2035

interface = interface,

2071

2036

use_ipv6 = use_ipv6,

2072

2037

socketfd = socketfd)

2073

2074

2038

def server_activate(self):

2075

2039

if self.enabled:

2076

2040

return socketserver.TCPServer.server_activate(self)

2080

2044

2081

2045

def add_pipe(self, parent_pipe, proc):

2082

2046

# Call "handle_ipc" for both data and EOF events

2083

gobject.io_add_watch(

2084

parent_pipe.fileno(),

2085

gobject.IO_IN | gobject.IO_HUP,

2086

functools.partial(self.handle_ipc,

2087

parent_pipe = parent_pipe,

2088

proc = proc))

2047

gobject.io_add_watch(parent_pipe.fileno(),

2048

gobject.IO_IN | gobject.IO_HUP,

2049

functools.partial(self.handle_ipc,

2050

parent_pipe =

2051

parent_pipe,

2052

proc = proc))

2089

2053

2090

def handle_ipc(self, source, condition,

2091

parent_pipe=None,

2092

proc = None,

2093

client_object=None):

2054

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

2055

proc = None, client_object=None):

2094

2056

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

2095

2057

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

2096

2058

# Wait for other process to exit

2119

2081

parent_pipe.send(False)

2120

2082

return False

2121

2083

2122

gobject.io_add_watch(

2123

parent_pipe.fileno(),

2124

gobject.IO_IN | gobject.IO_HUP,

2125

functools.partial(self.handle_ipc,

2126

parent_pipe = parent_pipe,

2127

proc = proc,

2128

client_object = client))

2084

gobject.io_add_watch(parent_pipe.fileno(),

2085

gobject.IO_IN | gobject.IO_HUP,

2086

functools.partial(self.handle_ipc,

2087

parent_pipe =

2088

parent_pipe,

2089

proc = proc,

2090

client_object =

2091

client))

2129

2092

parent_pipe.send(True)

2130

2093

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

2131

2094

# same fileno

2137

2100

2138

2101

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

2139

2102

funcname)(*args,

2140

**kwargs)))

2103

**kwargs)))

2141

2104

2142

2105

if command == 'getattr':

2143

2106

attrname = request[1]

2144

if isinstance(client_object.__getattribute__(attrname),

2145

collections.Callable):

2146

parent_pipe.send(('function', ))

2107

if callable(client_object.__getattribute__(attrname)):

2108

parent_pipe.send(('function',))

2147

2109

else:

2148

parent_pipe.send((

2149

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

2110

parent_pipe.send(('data', client_object

2111

.__getattribute__(attrname)))

2150

2112

2151

2113

if command == 'setattr':

2152

2114

attrname = request[1]

2183

2145

# avoid excessive use of external libraries.

2184

2146

2185

2147

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

2186

Token = collections.namedtuple("Token", (

2187

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

2188

# a "group" containing digits

2189

"value", # datetime.timedelta or None

2190

"followers")) # Tokens valid after this token

2148

Token = collections.namedtuple("Token",

2149

("regexp", # To match token; if

2150

# "value" is not None,

2151

# must have a "group"

2152

# containing digits

2153

"value", # datetime.timedelta or

2154

# None

2155

"followers")) # Tokens valid after

2156

# this token

2191

2157

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

2192

2158

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

2193

2159

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

2194

2160

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

2195

2161

datetime.timedelta(seconds=1),

2196

frozenset((token_end, )))

2162

frozenset((token_end,)))

2197

2163

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

2198

2164

datetime.timedelta(minutes=1),

2199

2165

frozenset((token_second, token_end)))

2215

2181

frozenset((token_month, token_end)))

2216

2182

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

2217

2183

datetime.timedelta(weeks=1),

2218

frozenset((token_end, )))

2184

frozenset((token_end,)))

2219

2185

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

2220

2186

frozenset((token_year, token_month,

2221

2187

token_day, token_time,

2223

2189

# Define starting values

2224

2190

value = datetime.timedelta() # Value so far

2225

2191

found_token = None

2226

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

2192

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

2227

2193

s = duration # String left to parse

2228

2194

# Loop until end token is found

2229

2195

while found_token is not token_end:

2246

2212

break

2247

2213

else:

2248

2214

# No currently valid tokens were found

2249

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

2250

.format(duration))

2215

raise ValueError("Invalid RFC 3339 duration")

2251

2216

# End token found

2252

2217

return value

2253

2218

2290

2255

elif suffix == "w":

2291

2256

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

2292

2257

else:

2293

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

2258

raise ValueError("Unknown suffix {!r}"

2259

.format(suffix))

2294

2260

except IndexError as e:

2295

2261

raise ValueError(*(e.args))

2296

2262

timevalue += delta

2312

2278

# Close all standard open file descriptors

2313

2279

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

2314

2280

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

2315

raise OSError(errno.ENODEV,

2316

"{} not a character device"

2281

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

2317

2282

.format(os.devnull))

2318

2283

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

2319

2284

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

2385

2350

"port": "",

2386

2351

"debug": "False",

2387

2352

"priority":

2388

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

2389

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

2353

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

2390

2354

"servicename": "Mandos",

2391

2355

"use_dbus": "True",

2392

2356

"use_ipv6": "True",

2396

2360

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

2397

2361

"foreground": "False",

2398

2362

"zeroconf": "True",

2399

}

2363

}

2400

2364

2401

2365

# Parse config file for server-global settings

2402

2366

server_config = configparser.SafeConfigParser(server_defaults)

2403

2367

del server_defaults

2404

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

2368

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

2369

"mandos.conf"))

2405

2370

# Convert the SafeConfigParser object to a dict

2406

2371

server_settings = server_config.defaults()

2407

2372

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

2425

2390

# Override the settings from the config file with command line

2426

2391

# options, if set.

2427

2392

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

2428

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

2429

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

2430

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

2393

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

2394

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

2395

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

2431

2396

value = getattr(options, option)

2432

2397

if value is not None:

2433

2398

server_settings[option] = value

2448

2413

2449

2414

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

2450

2415

2451

if (not server_settings["zeroconf"]

2452

and not (server_settings["port"]

2453

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

2454

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

2416

if (not server_settings["zeroconf"] and

2417

not (server_settings["port"]

2418

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

2419

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

2420

" Zeroconf")

2455

2421

2456

2422

# For convenience

2457

2423

debug = server_settings["debug"]

2473

2439

initlogger(debug, level)

2474

2440

2475

2441

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

2476

syslogger.setFormatter(

2477

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

2478

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

2479

server_settings["servicename"])))

2442

syslogger.setFormatter(logging.Formatter

2443

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

2444

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

2445

.format(server_settings

2446

["servicename"])))

2480

2447

2481

2448

# Parse config file with clients

2482

2449

client_config = configparser.SafeConfigParser(Client

2490

2457

socketfd = None

2491

2458

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

2492

2459

socketfd = server_settings["socket"]

2493

tcp_server = MandosServer(

2494

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

2495

ClientHandler,

2496

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

2497

use_ipv6=use_ipv6,

2498

gnutls_priority=server_settings["priority"],

2499

use_dbus=use_dbus,

2500

socketfd=socketfd)

2460

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

2461

server_settings["port"]),

2462

ClientHandler,

2463

interface=(server_settings["interface"]

2464

or None),

2465

use_ipv6=use_ipv6,

2466

gnutls_priority=

2467

server_settings["priority"],

2468

use_dbus=use_dbus,

2469

socketfd=socketfd)

2501

2470

if not foreground:

2502

2471

pidfilename = "/run/mandos.pid"

2503

2472

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

2504

2473

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

2505

2474

pidfile = None

2506

2475

try:

2507

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

2476

pidfile = open(pidfilename, "w")

2508

2477

except IOError as e:

2509

2478

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

2510

2479

exc_info=e)

2537

2506

def debug_gnutls(level, string):

2538

2507

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

2539

2508

2540

gnutls.library.functions.gnutls_global_set_log_function(

2541

debug_gnutls)

2509

(gnutls.library.functions

2510

.gnutls_global_set_log_function(debug_gnutls))

2542

2511

2543

2512

# Redirect stdin so all checkers get /dev/null

2544

2513

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

2564

2533

if use_dbus:

2565

2534

try:

2566

2535

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

2567

bus,

2568

do_not_queue=True)

2569

old_bus_name = dbus.service.BusName(

2570

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

2571

do_not_queue=True)

2572

except dbus.exceptions.DBusException as e:

2536

bus, do_not_queue=True)

2537

old_bus_name = (dbus.service.BusName

2538

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

2539

do_not_queue=True))

2540

except dbus.exceptions.NameExistsException as e:

2573

2541

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

2574

2542

use_dbus = False

2575

2543

server_settings["use_dbus"] = False

2576

2544

tcp_server.use_dbus = False

2577

2545

if zeroconf:

2578

2546

protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET

2579

service = AvahiServiceToSyslog(

2580

name = server_settings["servicename"],

2581

servicetype = "_mandos._tcp",

2582

protocol = protocol,

2583

bus = bus)

2547

service = AvahiServiceToSyslog(name =

2548

server_settings["servicename"],

2549

servicetype = "_mandos._tcp",

2550

protocol = protocol, bus = bus)

2584

2551

if server_settings["interface"]:

2585

service.interface = if_nametoindex(

2586

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

2552

service.interface = (if_nametoindex

2553

(server_settings["interface"]

2554

.encode("utf-8")))

2587

2555

2588

2556

global multiprocessing_manager

2589

2557

multiprocessing_manager = multiprocessing.Manager()

2608

2576

if server_settings["restore"]:

2609

2577

try:

2610

2578

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

2611

clients_data, old_client_settings = pickle.load(

2612

stored_state)

2579

clients_data, old_client_settings = (pickle.load

2580

(stored_state))

2613

2581

os.remove(stored_state_path)

2614

2582

except IOError as e:

2615

2583

if e.errno == errno.ENOENT:

2616

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

2617

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

2584

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

2585

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

2618

2586

else:

2619

2587

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

2620

2588

exc_info=e)

2621

2589

raise

2622

2590

except EOFError as e:

2623

2591

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

2624

"EOFError:",

2625

exc_info=e)

2592

"EOFError:", exc_info=e)

2626

2593

2627

2594

with PGPEngine() as pgp:

2628

2595

for client_name, client in clients_data.items():

2640

2607

# For each value in new config, check if it

2641

2608

# differs from the old config value (Except for

2642

2609

# the "secret" attribute)

2643

if (name != "secret"

2644

and (value !=

2645

old_client_settings[client_name][name])):

2610

if (name != "secret" and

2611

value != old_client_settings[client_name]

2612

[name]):

2646

2613

client[name] = value

2647

2614

except KeyError:

2648

2615

pass

2649

2616

2650

2617

# Clients who has passed its expire date can still be

2651

# enabled if its last checker was successful. A Client

2618

# enabled if its last checker was successful. Clients

2652

2619

# whose checker succeeded before we stored its state is

2653

2620

# assumed to have successfully run all checkers during

2654

2621

# downtime.

2657

2624

if not client["last_checked_ok"]:

2658

2625

logger.warning(

2659

2626

"disabling client {} - Client never "

2660

"performed a successful checker".format(

2661

client_name))

2627

"performed a successful checker"

2628

.format(client_name))

2662

2629

client["enabled"] = False

2663

2630

elif client["last_checker_status"] != 0:

2664

2631

logger.warning(

2665

2632

"disabling client {} - Client last"

2666

" checker failed with error code"

2667

" {}".format(

2668

client_name,

2669

client["last_checker_status"]))

2633

" checker failed with error code {}"

2634

.format(client_name,

2635

client["last_checker_status"]))

2670

2636

client["enabled"] = False

2671

2637

else:

2672

client["expires"] = (

2673

datetime.datetime.utcnow()

2674

+ client["timeout"])

2638

client["expires"] = (datetime.datetime

2639

.utcnow()

2640

+ client["timeout"])

2675

2641

logger.debug("Last checker succeeded,"

2676

" keeping {} enabled".format(

2677

client_name))

2642

" keeping {} enabled"

2643

.format(client_name))

2678

2644

try:

2679

client["secret"] = pgp.decrypt(

2680

client["encrypted_secret"],

2681

client_settings[client_name]["secret"])

2645

client["secret"] = (

2646

pgp.decrypt(client["encrypted_secret"],

2647

client_settings[client_name]

2648

["secret"]))

2682

2649

except PGPError:

2683

2650

# If decryption fails, we use secret from new settings

2684

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

2685

client_name))

2686

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

2687

["secret"])

2651

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

2652

.format(client_name))

2653

client["secret"] = (

2654

client_settings[client_name]["secret"])

2688

2655

2689

2656

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

2690

2657

for client_name in (set(old_client_settings)

2697

2664

# Create all client objects

2698

2665

for client_name, client in clients_data.items():

2699

2666

tcp_server.clients[client_name] = client_class(

2700

name = client_name,

2701

settings = client,

2667

name = client_name, settings = client,

2702

2668

server_settings = server_settings)

2703

2669

2704

2670

if not tcp_server.clients:

2706

2672

2707

2673

if not foreground:

2708

2674

if pidfile is not None:

2709

pid = os.getpid()

2710

2675

try:

2711

2676

with pidfile:

2712

print(pid, file=pidfile)

2677

pid = os.getpid()

2678

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

2713

2679

except IOError:

2714

2680

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

2715

2681

pidfilename, pid)

2720

2686

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

2721

2687

2722

2688

if use_dbus:

2723

2724

@alternate_dbus_interfaces(

2725

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

2689

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

2690

"se.bsnet.fukt.Mandos"})

2726

2691

class MandosDBusService(DBusObjectWithProperties):

2727

2692

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

2728

2729

2693

def __init__(self):

2730

2694

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

2731

2732

2695

_interface = "se.recompile.Mandos"

2733

2696

2734

2697

@dbus_interface_annotations(_interface)

2735

2698

def _foo(self):

2736

return {

2737

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

2738

"false" }

2699

return { "org.freedesktop.DBus.Property"

2700

".EmitsChangedSignal":

2701

"false"}

2739

2702

2740

2703

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

2741

2704

def ClientAdded(self, objpath):

2755

2718

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

2756

2719

def GetAllClients(self):

2757

2720

"D-Bus method"

2758

return dbus.Array(c.dbus_object_path for c in

2721

return dbus.Array(c.dbus_object_path

2722

for c in

2759

2723

tcp_server.clients.itervalues())

2760

2724

2761

2725

@dbus.service.method(_interface,

2810

2774

# + secret.

2811

2775

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

2812

2776

"checker", "server_settings" }

2813

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

2814

.Object):

2777

for name, typ in (inspect.getmembers

2778

(dbus.service.Object)):

2815

2779

exclude.add(name)

2816

2780

2817

2781

client_dict["encrypted_secret"] = (client

2824

2788

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

2825

2789

2826

2790

try:

2827

with tempfile.NamedTemporaryFile(

2828

mode='wb',

2829

suffix=".pickle",

2830

prefix='clients-',

2831

dir=os.path.dirname(stored_state_path),

2832

delete=False) as stored_state:

2791

with (tempfile.NamedTemporaryFile

2792

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

2793

dir=os.path.dirname(stored_state_path),

2794

delete=False)) as stored_state:

2833

2795

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

2834

tempname = stored_state.name

2796

tempname=stored_state.name

2835

2797

os.rename(tempname, stored_state_path)

2836

2798

except (IOError, OSError) as e:

2837

2799

if not debug:

2856

2818

client.disable(quiet=True)

2857

2819

if use_dbus:

2858

2820

# Emit D-Bus signal

2859

mandos_dbus_service.ClientRemoved(

2860

client.dbus_object_path, client.name)

2821

mandos_dbus_service.ClientRemoved(client

2822

.dbus_object_path,

2823

client.name)

2861

2824

client_settings.clear()

2862

2825

2863

2826

atexit.register(cleanup)

2916

2879

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

2917

2880

cleanup()

2918

2881

2919

2920

2882

if __name__ == '__main__':

2921

2883

main()