/mandos/trunk : revision 525

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

34

from __future__ import (division, absolute_import, print_function,

35

unicode_literals)

36

37

from future_builtins import *

38

39

37

import SocketServer as socketserver

40

38

import socket

41

39

import argparse

67

65

import types

68

66

import binascii

69

67

import tempfile

70

import itertools

71

68

72

69

import dbus

73

70

import dbus.service

88

85

except ImportError:

89

86

SO_BINDTODEVICE = None

90

87

91

version = "1.5.3"

88

version = "1.4.1"

92

89

stored_state_file = "clients.pickle"

93

90

94

91

logger = logging.getLogger()

113

110

return interface_index

114

111

115

112

116

def initlogger(debug, level=logging.WARNING):

113

def initlogger(level=logging.WARNING):

117

114

"""init logger and add loglevel"""

118

115

119

116

syslogger.setFormatter(logging.Formatter

121

118

' %(message)s'))

122

119

logger.addHandler(syslogger)

123

120

124

if debug:

125

console = logging.StreamHandler()

126

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

127

' [%(process)d]:'

128

' %(levelname)s:'

129

' %(message)s'))

130

logger.addHandler(console)

121

console = logging.StreamHandler()

122

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

123

' [%(process)d]:'

124

' %(levelname)s:'

125

' %(message)s'))

126

logger.addHandler(console)

131

127

logger.setLevel(level)

132

128

133

129

145

141

self.gnupg.options.meta_interactive = False

146

142

self.gnupg.options.homedir = self.tempdir

147

143

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

148

'--quiet',

149

'--no-use-agent'])

144

'--quiet'])

150

145

151

146

def __enter__(self):

152

147

return self

178

173

179

174

def encrypt(self, data, password):

180

175

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

181

with open(os.devnull, "w") as devnull:

176

with open(os.devnull) as devnull:

182

177

try:

183

178

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

184

179

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

195

190

196

191

def decrypt(self, data, password):

197

192

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

198

with open(os.devnull, "w") as devnull:

193

with open(os.devnull) as devnull:

199

194

try:

200

195

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

201

196

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

202

197

attach_fhs={'stderr': devnull})

203

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

198

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

204

199

f.write(data)

205

200

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

206

201

decrypted_plaintext = f.read()

211

206

return decrypted_plaintext

212

207

213

208

209

214

210

class AvahiError(Exception):

215

211

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

216

212

self.value = value

245

241

server: D-Bus Server

246

242

bus: dbus.SystemBus()

247

243

"""

248

249

244

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

250

245

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

251

246

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

264

259

self.server = None

265

260

self.bus = bus

266

261

self.entry_group_state_changed_match = None

267

268

262

def rename(self):

269

263

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

270

264

if self.rename_count >= self.max_renames:

280

274

try:

281

275

self.add()

282

276

except dbus.exceptions.DBusException as error:

283

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

277

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

284

278

self.cleanup()

285

279

os._exit(1)

286

280

self.rename_count += 1

287

288

281

def remove(self):

289

282

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

290

283

if self.entry_group_state_changed_match is not None:

292

285

self.entry_group_state_changed_match = None

293

286

if self.group is not None:

294

287

self.group.Reset()

295

296

288

def add(self):

297

289

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

298

290

self.remove()

315

307

dbus.UInt16(self.port),

316

308

avahi.string_array_to_txt_array(self.TXT))

317

309

self.group.Commit()

318

319

310

def entry_group_state_changed(self, state, error):

320

311

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

321

312

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

328

319

elif state == avahi.ENTRY_GROUP_FAILURE:

329

320

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

330

321

unicode(error))

331

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

332

.format(error))

333

322

raise AvahiGroupError("State changed: %s"

323

% unicode(error))

334

324

def cleanup(self):

335

325

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

336

326

if self.group is not None:

341

331

pass

342

332

self.group = None

343

333

self.remove()

344

345

334

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

346

335

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

347

336

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

366

355

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

367

356

else:

368

357

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

369

370

358

def activate(self):

371

359

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

372

360

if self.server is None:

384

372

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

385

373

ret = AvahiService.rename(self)

386

374

syslogger.setFormatter(logging.Formatter

387

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

388

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

389

.format(self.name)))

375

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

376

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

377

% self.name))

390

378

return ret

391

379

392

380

def timedelta_to_milliseconds(td):

394

382

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

395

383

+ (td.seconds * 1000)

396

384

+ (td.microseconds // 1000))

397

385

398

386

class Client(object):

399

387

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

400

388

425

413

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

426

414

last_checker_status: integer between 0 and 255 reflecting exit

427

415

status of last checker. -1 reflects crashed

428

checker, -2 means no checker completed yet.

416

checker, or None.

429

417

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

430

418

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

431

419

D-Bus identifiers

432

420

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

433

421

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

434

422

until this client is disabled

435

extended_timeout: extra long timeout when secret has been sent

423

extended_timeout: extra long timeout when password has been sent

436

424

runtime_expansions: Allowed attributes for runtime expansion.

437

425

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

438

426

disabled, or None

467

455

468

456

def approval_delay_milliseconds(self):

469

457

return timedelta_to_milliseconds(self.approval_delay)

470

458

471

459

@staticmethod

472

460

def config_parser(config):

473

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

461

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

474

462

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

475

with exceptions for any special settings as defined above.

476

NOTE: Must be a pure function. Must return the same result

477

value given the same arguments.

478

"""

463

with exceptions for any special settings as defined above"""

479

464

settings = {}

480

465

for client_name in config.sections():

481

466

section = dict(config.items(client_name))

485

470

# Reformat values from string types to Python types

486

471

client["approved_by_default"] = config.getboolean(

487

472

client_name, "approved_by_default")

488

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

489

"enabled")

473

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

490

474

491

475

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

492

476

.replace(" ", ""))

498

482

"rb") as secfile:

499

483

client["secret"] = secfile.read()

500

484

else:

501

raise TypeError("No secret or secfile for section {0}"

502

.format(section))

485

raise TypeError("No secret or secfile for section %s"

486

% section)

503

487

client["timeout"] = string_to_delta(section["timeout"])

504

488

client["extended_timeout"] = string_to_delta(

505

489

section["extended_timeout"])

511

495

client["checker_command"] = section["checker"]

512

496

client["last_approval_request"] = None

513

497

client["last_checked_ok"] = None

514

client["last_checker_status"] = -2

515

498

client["last_checker_status"] = None

499

if client["enabled"]:

500

client["last_enabled"] = datetime.datetime.utcnow()

501

client["expires"] = (datetime.datetime.utcnow()

502

+ client["timeout"])

503

else:

504

client["last_enabled"] = None

505

client["expires"] = None

506

516

507

return settings

517

508

509

518

510

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

511

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

512

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

513

attribute."""

519

514

self.name = name

520

515

# adding all client settings

521

516

for setting, value in settings.iteritems():

522

517

setattr(self, setting, value)

523

518

524

if self.enabled:

525

if not hasattr(self, "last_enabled"):

526

self.last_enabled = datetime.datetime.utcnow()

527

if not hasattr(self, "expires"):

528

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

529

+ self.timeout)

530

else:

531

self.last_enabled = None

532

self.expires = None

533

534

519

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

535

520

# Uppercase and remove spaces from fingerprint for later

536

521

# comparison purposes with return value from the fingerprint()

537

522

# function

538

523

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

539

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

540

datetime.datetime.utcnow())

541

524

self.created = settings.get("created", datetime.datetime.utcnow())

525

542

526

# attributes specific for this server instance

543

527

self.checker = None

544

528

self.checker_initiator_tag = None

572

556

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

573

557

# Already enabled

574

558

return

559

self.send_changedstate()

575

560

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

576

561

self.enabled = True

577

562

self.last_enabled = datetime.datetime.utcnow()

578

563

self.init_checker()

579

self.send_changedstate()

580

564

581

565

def disable(self, quiet=True):

582

566

"""Disable this client."""

583

567

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

584

568

return False

585

569

if not quiet:

570

self.send_changedstate()

571

if not quiet:

586

572

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

587

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

573

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

588

574

gobject.source_remove(self.disable_initiator_tag)

589

575

self.disable_initiator_tag = None

590

576

self.expires = None

591

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

577

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

592

578

gobject.source_remove(self.checker_initiator_tag)

593

579

self.checker_initiator_tag = None

594

580

self.stop_checker()

595

581

self.enabled = False

596

if not quiet:

597

self.send_changedstate()

598

582

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

599

583

return False

600

584

604

588

def init_checker(self):

605

589

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

606

590

# and every interval from then on.

607

if self.checker_initiator_tag is not None:

608

gobject.source_remove(self.checker_initiator_tag)

609

591

self.checker_initiator_tag = (gobject.timeout_add

610

592

(self.interval_milliseconds(),

611

593

self.start_checker))

612

594

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

613

if self.disable_initiator_tag is not None:

614

gobject.source_remove(self.disable_initiator_tag)

615

595

self.disable_initiator_tag = (gobject.timeout_add

616

596

(self.timeout_milliseconds(),

617

597

self.disable))

636

616

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

637

617

vars(self))

638

618

639

def checked_ok(self):

640

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

641

self.last_checked_ok = datetime.datetime.utcnow()

642

self.last_checker_status = 0

643

self.bump_timeout()

644

645

def bump_timeout(self, timeout=None):

646

"""Bump up the timeout for this client."""

619

def checked_ok(self, timeout=None):

620

"""Bump up the timeout for this client.

621

622

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

623

alive and well.

624

"""

647

625

if timeout is None:

648

626

timeout = self.timeout

627

self.last_checked_ok = datetime.datetime.utcnow()

649

628

if self.disable_initiator_tag is not None:

650

629

gobject.source_remove(self.disable_initiator_tag)

651

self.disable_initiator_tag = None

652

630

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

653

631

self.disable_initiator_tag = (gobject.timeout_add

654

632

(timedelta_to_milliseconds

664

642

If a checker already exists, leave it running and do

665

643

nothing."""

666

644

# The reason for not killing a running checker is that if we

667

# did that, and if a checker (for some reason) started running

668

# slowly and taking more than 'interval' time, then the client

669

# would inevitably timeout, since no checker would get a

670

# chance to run to completion. If we instead leave running

645

# did that, then if a checker (for some reason) started

646

# running slowly and taking more than 'interval' time, the

647

# client would inevitably timeout, since no checker would get

648

# a chance to run to completion. If we instead leave running

671

649

# checkers alone, the checker would have to take more time

672

650

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

673

651

# should be.

703

681

try:

704

682

command = self.checker_command % escaped_attrs

705

683

except TypeError as error:

706

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

707

self.checker_command, exc_info=error)

684

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

685

' %s', self.checker_command, error)

708

686

return True # Try again later

709

687

self.current_checker_command = command

710

688

try:

728

706

gobject.source_remove(self.checker_callback_tag)

729

707

self.checker_callback(pid, status, command)

730

708

except OSError as error:

731

logger.error("Failed to start subprocess",

732

exc_info=error)

709

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

710

error)

733

711

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

734

712

return True

735

713

742

720

return

743

721

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

744

722

try:

745

self.checker.terminate()

723

os.kill(self.checker.pid, signal.SIGTERM)

746

724

#time.sleep(0.5)

747

725

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

748

# self.checker.kill()

726

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

749

727

except OSError as error:

750

728

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

751

729

raise

768

746

# "Set" method, so we fail early here:

769

747

if byte_arrays and signature != "ay":

770

748

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

771

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

749

" signature %r" % signature)

772

750

def decorator(func):

773

751

func._dbus_is_property = True

774

752

func._dbus_interface = dbus_interface

782

760

return decorator

783

761

784

762

785

def dbus_interface_annotations(dbus_interface):

786

"""Decorator for marking functions returning interface annotations

787

788

Usage:

789

790

@dbus_interface_annotations("org.example.Interface")

791

def _foo(self): # Function name does not matter

792

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

793

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

794

"false"}

795

"""

796

def decorator(func):

797

func._dbus_is_interface = True

798

func._dbus_interface = dbus_interface

799

func._dbus_name = dbus_interface

800

return func

801

return decorator

802

803

804

def dbus_annotations(annotations):

805

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

806

Usage:

807

808

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

809

access="r")

810

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

811

"org.freedesktop.DBus.Property."

812

"EmitsChangedSignal": "false"})

813

def Property_dbus_property(self):

814

return dbus.Boolean(False)

815

"""

816

def decorator(func):

817

func._dbus_annotations = annotations

818

return func

819

return decorator

820

821

822

763

class DBusPropertyException(dbus.exceptions.DBusException):

823

764

"""A base class for D-Bus property-related exceptions

824

765

"""

847

788

"""

848

789

849

790

@staticmethod

850

def _is_dbus_thing(thing):

851

"""Returns a function testing if an attribute is a D-Bus thing

852

853

If called like _is_dbus_thing("method") it returns a function

854

suitable for use as predicate to inspect.getmembers().

855

"""

856

return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),

857

False)

791

def _is_dbus_property(obj):

792

return getattr(obj, "_dbus_is_property", False)

858

793

859

def _get_all_dbus_things(self, thing):

794

def _get_all_dbus_properties(self):

860

795

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

861

796

"""

862

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

863

name),

864

athing.__get__(self))

797

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

865

798

for cls in self.__class__.__mro__

866

for name, athing in

867

inspect.getmembers(cls,

868

self._is_dbus_thing(thing)))

799

for name, prop in

800

inspect.getmembers(cls, self._is_dbus_property))

869

801

870

802

def _get_dbus_property(self, interface_name, property_name):

871

803

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

873

805

"""

874

806

for cls in self.__class__.__mro__:

875

807

for name, value in (inspect.getmembers

876

(cls,

877

self._is_dbus_thing("property"))):

808

(cls, self._is_dbus_property)):

878

809

if (value._dbus_name == property_name

879

810

and value._dbus_interface == interface_name):

880

811

return value.__get__(self)

909

840

# signatures other than "ay".

910

841

if prop._dbus_signature != "ay":

911

842

raise ValueError

912

value = dbus.ByteArray(b''.join(chr(byte)

913

for byte in value))

843

value = dbus.ByteArray(''.join(unichr(byte)

844

for byte in value))

914

845

prop(value)

915

846

916

847

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

922

853

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

923

854

"""

924

855

properties = {}

925

for name, prop in self._get_all_dbus_things("property"):

856

for name, prop in self._get_all_dbus_properties():

926

857

if (interface_name

927

858

and interface_name != prop._dbus_interface):

928

859

# Interface non-empty but did not match

943

874

path_keyword='object_path',

944

875

connection_keyword='connection')

945

876

def Introspect(self, object_path, connection):

946

"""Overloading of standard D-Bus method.

947

948

Inserts property tags and interface annotation tags.

877

"""Standard D-Bus method, overloaded to insert property tags.

949

878

"""

950

879

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

951

880

connection)

958

887

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

959

888

return e

960

889

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

961

# Add property tags

962

890

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

963

891

for name, prop

964

in self._get_all_dbus_things("property")

892

in self._get_all_dbus_properties()

965

893

if prop._dbus_interface

966

894

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

967

895

if_tag.appendChild(tag)

968

# Add annotation tags

969

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

970

for tag in if_tag.getElementsByTagName(typ):

971

annots = dict()

972

for name, prop in (self.

973

_get_all_dbus_things(typ)):

974

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

975

and prop._dbus_interface

976

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

977

annots.update(getattr

978

(prop,

979

"_dbus_annotations",

980

{}))

981

for name, value in annots.iteritems():

982

ann_tag = document.createElement(

983

"annotation")

984

ann_tag.setAttribute("name", name)

985

ann_tag.setAttribute("value", value)

986

tag.appendChild(ann_tag)

987

# Add interface annotation tags

988

for annotation, value in dict(

989

itertools.chain.from_iterable(

990

annotations().iteritems()

991

for name, annotations in

992

self._get_all_dbus_things("interface")

993

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

994

)).iteritems():

995

ann_tag = document.createElement("annotation")

996

ann_tag.setAttribute("name", annotation)

997

ann_tag.setAttribute("value", value)

998

if_tag.appendChild(ann_tag)

999

896

# Add the names to the return values for the

1000

897

# "org.freedesktop.DBus.Properties" methods

1001

898

if (if_tag.getAttribute("name")

1016

913

except (AttributeError, xml.dom.DOMException,

1017

914

xml.parsers.expat.ExpatError) as error:

1018

915

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

1019

exc_info=error)

916

error)

1020

917

return xmlstring

1021

918

1022

919

1028

925

variant_level=variant_level)

1029

926

1030

927

1031

def alternate_dbus_interfaces(alt_interface_names, deprecate=True):

1032

"""A class decorator; applied to a subclass of

1033

dbus.service.Object, it will add alternate D-Bus attributes with

1034

interface names according to the "alt_interface_names" mapping.

1035

Usage:

1036

1037

@alternate_dbus_names({"org.example.Interface":

1038

"net.example.AlternateInterface"})

1039

class SampleDBusObject(dbus.service.Object):

1040

@dbus.service.method("org.example.Interface")

1041

def SampleDBusMethod():

1042

pass

1043

1044

The above "SampleDBusMethod" on "SampleDBusObject" will be

1045

reachable via two interfaces: "org.example.Interface" and

1046

"net.example.AlternateInterface", the latter of which will have

1047

its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to

1048

"true", unless "deprecate" is passed with a False value.

1049

1050

This works for methods and signals, and also for D-Bus properties

1051

(from DBusObjectWithProperties) and interfaces (from the

1052

dbus_interface_annotations decorator).

928

class AlternateDBusNamesMetaclass(DBusObjectWithProperties

929

.__metaclass__):

930

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

931

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

1053

932

"""

1054

def wrapper(cls):

1055

for orig_interface_name, alt_interface_name in (

1056

alt_interface_names.iteritems()):

1057

attr = {}

1058

interface_names = set()

1059

# Go though all attributes of the class

1060

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

933

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

934

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

935

# methods, signals, or properties in them

936

for base in (b for b in bases

937

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

938

# Go though all attributes of the base class

939

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

1061

940

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

1062

941

# with the wrong interface name

1063

942

if (not hasattr(attribute, "_dbus_interface")

1064

943

or not attribute._dbus_interface

1065

.startswith(orig_interface_name)):

944

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

1066

945

continue

1067

946

# Create an alternate D-Bus interface name based on

1068

947

# the current name

1069

948

alt_interface = (attribute._dbus_interface

1070

.replace(orig_interface_name,

1071

alt_interface_name))

1072

interface_names.add(alt_interface)

949

.replace("se.recompile.Mandos",

950

"se.bsnet.fukt.Mandos"))

1073

951

# Is this a D-Bus signal?

1074

952

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

1075

953

# Extract the original non-method function by

1090

968

nonmethod_func.func_name,

1091

969

nonmethod_func.func_defaults,

1092

970

nonmethod_func.func_closure)))

1093

# Copy annotations, if any

1094

try:

1095

new_function._dbus_annotations = (

1096

dict(attribute._dbus_annotations))

1097

except AttributeError:

1098

pass

1099

971

# Define a creator of a function to call both the

1100

# original and alternate functions, so both the

1101

# original and alternate signals gets sent when

1102

# the function is called

972

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

973

# signals gets sent when the function is called

1103

974

def fixscope(func1, func2):

1104

975

"""This function is a scope container to pass

1105

976

func1 and func2 to the "call_both" function

1112

983

return call_both

1113

984

# Create the "call_both" function and add it to

1114

985

# the class

1115

attr[attrname] = fixscope(attribute, new_function)

986

attr[attrname] = fixscope(attribute,

987

new_function)

1116

988

# Is this a D-Bus method?

1117

989

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

1118

990

# Create a new, but exactly alike, function

1129

1001

attribute.func_name,

1130

1002

attribute.func_defaults,

1131

1003

attribute.func_closure)))

1132

# Copy annotations, if any

1133

try:

1134

attr[attrname]._dbus_annotations = (

1135

dict(attribute._dbus_annotations))

1136

except AttributeError:

1137

pass

1138

1004

# Is this a D-Bus property?

1139

1005

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

1140

1006

# Create a new, but exactly alike, function

1154

1020

attribute.func_name,

1155

1021

attribute.func_defaults,

1156

1022

attribute.func_closure)))

1157

# Copy annotations, if any

1158

try:

1159

attr[attrname]._dbus_annotations = (

1160

dict(attribute._dbus_annotations))

1161

except AttributeError:

1162

pass

1163

# Is this a D-Bus interface?

1164

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

1165

# Create a new, but exactly alike, function

1166

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

1167

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

1168

# to the class.

1169

attr[attrname] = (dbus_interface_annotations

1170

(alt_interface)

1171

(types.FunctionType

1172

(attribute.func_code,

1173

attribute.func_globals,

1174

attribute.func_name,

1175

attribute.func_defaults,

1176

attribute.func_closure)))

1177

if deprecate:

1178

# Deprecate all alternate interfaces

1179

iname="_AlternateDBusNames_interface_annotation{0}"

1180

for interface_name in interface_names:

1181

@dbus_interface_annotations(interface_name)

1182

def func(self):

1183

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

1184

"true" }

1185

# Find an unused name

1186

for aname in (iname.format(i)

1187

for i in itertools.count()):

1188

if aname not in attr:

1189

attr[aname] = func

1190

break

1191

if interface_names:

1192

# Replace the class with a new subclass of it with

1193

# methods, signals, etc. as created above.

1194

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

1195

(cls,), attr)

1196

return cls

1197

return wrapper

1198

1199

1200

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

1201

"se.bsnet.fukt.Mandos"})

1023

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

1024

1025

1202

1026

class ClientDBus(Client, DBusObjectWithProperties):

1203

1027

"""A Client class using D-Bus

1204

1028

1215

1039

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

1216

1040

self.bus = bus

1217

1041

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

1042

self._approvals_pending = 0

1043

1044

self._approvals_pending = 0

1218

1045

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

1219

1046

# the D-Bus

1220

1047

client_object_name = unicode(self.name).translate(

1224

1051

("/clients/" + client_object_name))

1225

1052

DBusObjectWithProperties.__init__(self, self.bus,

1226

1053

self.dbus_object_path)

1227

1054

1228

1055

def notifychangeproperty(transform_func,

1229

1056

dbus_name, type_func=lambda x: x,

1230

1057

variant_level=1):

1253

1080

1254

1081

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

1255

1082

1083

1256

1084

expires = notifychangeproperty(datetime_to_dbus, "Expires")

1257

1085

approvals_pending = notifychangeproperty(dbus.Boolean,

1258

1086

"ApprovalPending",

1265

1093

checker is not None)

1266

1094

last_checked_ok = notifychangeproperty(datetime_to_dbus,

1267

1095

"LastCheckedOK")

1268

last_checker_status = notifychangeproperty(dbus.Int16,

1269

"LastCheckerStatus")

1270

1096

last_approval_request = notifychangeproperty(

1271

1097

datetime_to_dbus, "LastApprovalRequest")

1272

1098

approved_by_default = notifychangeproperty(dbus.Boolean,

1340

1166

return False

1341

1167

1342

1168

def approve(self, value=True):

1169

self.send_changedstate()

1343

1170

self.approved = value

1344

1171

gobject.timeout_add(timedelta_to_milliseconds

1345

1172

(self.approval_duration),

1346

1173

self._reset_approved)

1347

self.send_changedstate()

1174

1348

1175

1349

1176

## D-Bus methods, signals & properties

1350

1177

_interface = "se.recompile.Mandos.Client"

1351

1178

1352

## Interfaces

1353

1354

@dbus_interface_annotations(_interface)

1355

def _foo(self):

1356

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

1357

"false"}

1358

1359

1179

## Signals

1360

1180

1361

1181

# CheckerCompleted - signal

1397

1217

"D-Bus signal"

1398

1218

return self.need_approval()

1399

1219

1220

# NeRwequest - signal

1221

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

1222

def NewRequest(self, ip):

1223

"""D-Bus signal

1224

Is sent after a client request a password.

1225

"""

1226

pass

1227

1400

1228

## Methods

1401

1229

1402

1230

# Approve - method

1512

1340

return

1513

1341

return datetime_to_dbus(self.last_checked_ok)

1514

1342

1515

# LastCheckerStatus - property

1516

@dbus_service_property(_interface, signature="n",

1517

access="read")

1518

def LastCheckerStatus_dbus_property(self):

1519

return dbus.Int16(self.last_checker_status)

1520

1521

1343

# Expires - property

1522

1344

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

1523

1345

def Expires_dbus_property(self):

1534

1356

def Timeout_dbus_property(self, value=None):

1535

1357

if value is None: # get

1536

1358

return dbus.UInt64(self.timeout_milliseconds())

1537

old_timeout = self.timeout

1538

1359

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

1539

# Reschedule disabling

1540

if self.enabled:

1541

now = datetime.datetime.utcnow()

1542

self.expires += self.timeout - old_timeout

1543

if self.expires <= now:

1544

# The timeout has passed

1545

self.disable()

1546

else:

1547

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

1548

is None):

1549

return

1550

gobject.source_remove(self.disable_initiator_tag)

1551

self.disable_initiator_tag = (

1552

gobject.timeout_add(

1553

timedelta_to_milliseconds(self.expires - now),

1554

self.disable))

1360

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

1361

return

1362

# Reschedule timeout

1363

gobject.source_remove(self.disable_initiator_tag)

1364

self.disable_initiator_tag = None

1365

self.expires = None

1366

time_to_die = timedelta_to_milliseconds((self

1367

.last_checked_ok

1368

+ self.timeout)

1369

- datetime.datetime

1370

.utcnow())

1371

if time_to_die <= 0:

1372

# The timeout has passed

1373

self.disable()

1374

else:

1375

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

1376

+ datetime.timedelta(milliseconds =

1377

time_to_die))

1378

self.disable_initiator_tag = (gobject.timeout_add

1379

(time_to_die, self.disable))

1555

1380

1556

1381

# ExtendedTimeout - property

1557

1382

@dbus_service_property(_interface, signature="t",

1636

1461

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

1637

1462

1638

1463

1464

class ClientDBusTransitional(ClientDBus):

1465

__metaclass__ = AlternateDBusNamesMetaclass

1466

1467

1639

1468

class ClientHandler(socketserver.BaseRequestHandler, object):

1640

1469

"""A class to handle client connections.

1641

1470

1709

1538

except KeyError:

1710

1539

return

1711

1540

1541

if self.server.use_dbus:

1542

# Emit D-Bus signal

1543

client.NewRequest(str(self.client_address))

1544

1712

1545

if client.approval_delay:

1713

1546

delay = client.approval_delay

1714

1547

client.approvals_pending += 1

1745

1578

#wait until timeout or approved

1746

1579

time = datetime.datetime.now()

1747

1580

client.changedstate.acquire()

1748

client.changedstate.wait(

1749

float(timedelta_to_milliseconds(delay)

1750

/ 1000))

1581

(client.changedstate.wait

1582

(float(client.timedelta_to_milliseconds(delay)

1583

/ 1000)))

1751

1584

client.changedstate.release()

1752

1585

time2 = datetime.datetime.now()

1753

1586

if (time2 - time) >= delay:

1769

1602

try:

1770

1603

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

1771

1604

except gnutls.errors.GNUTLSError as error:

1772

logger.warning("gnutls send failed",

1773

exc_info=error)

1605

logger.warning("gnutls send failed")

1774

1606

return

1775

1607

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

1776

1608

sent, len(client.secret)

1779

1611

1780

1612

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

1781

1613

# bump the timeout using extended_timeout

1782

client.bump_timeout(client.extended_timeout)

1614

client.checked_ok(client.extended_timeout)

1783

1615

if self.server.use_dbus:

1784

1616

# Emit D-Bus signal

1785

1617

client.GotSecret()

1790

1622

try:

1791

1623

session.bye()

1792

1624

except gnutls.errors.GNUTLSError as error:

1793

logger.warning("GnuTLS bye failed",

1794

exc_info=error)

1625

logger.warning("GnuTLS bye failed")

1795

1626

1796

1627

@staticmethod

1797

1628

def peer_certificate(session):

1869

1700

def process_request(self, request, address):

1870

1701

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

1871

1702

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

1872

args = (request, address))

1703

args = (request,

1704

address))

1873

1705

proc.start()

1874

1706

return proc

1875

1707

1997

1829

1998

1830

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

1999

1831

proc = None, client_object=None):

1832

condition_names = {

1833

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

1834

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

1835

# blocking).

1836

gobject.IO_PRI: "PRI", # There is urgent data to read.

1837

gobject.IO_ERR: "ERR", # Error condition.

1838

gobject.IO_HUP: "HUP" # Hung up (the connection has been

1839

# broken, usually for pipes and

1840

# sockets).

1841

}

1842

conditions_string = ' | '.join(name

1843

for cond, name in

1844

condition_names.iteritems()

1845

if cond & condition)

2000

1846

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

2001

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

1847

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

2002

1848

# Wait for other process to exit

2003

1849

proc.join()

2004

1850

return False

2094

1940

elif suffix == "w":

2095

1941

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

2096

1942

else:

2097

raise ValueError("Unknown suffix {0!r}"

2098

.format(suffix))

1943

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

2099

1944

except (ValueError, IndexError) as e:

2100

1945

raise ValueError(*(e.args))

2101

1946

timevalue += delta

2115

1960

sys.exit()

2116

1961

if not noclose:

2117

1962

# Close all standard open file descriptors

2118

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

1963

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

2119

1964

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

2120

1965

raise OSError(errno.ENODEV,

2121

"{0} not a character device"

2122

.format(os.devnull))

1966

"%s not a character device"

1967

% os.path.devnull)

2123

1968

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

2124

1969

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

2125

1970

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

2134

1979

2135

1980

parser = argparse.ArgumentParser()

2136

1981

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

2137

version = "%(prog)s {0}".format(version),

1982

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

2138

1983

help="show version number and exit")

2139

1984

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

2140

1985

help="Bind to interface IF")

2233

2078

stored_state_file)

2234

2079

2235

2080

if debug:

2236

initlogger(debug, logging.DEBUG)

2081

initlogger(logging.DEBUG)

2237

2082

else:

2238

2083

if not debuglevel:

2239

initlogger(debug)

2084

initlogger()

2240

2085

else:

2241

2086

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

2242

initlogger(debug, level)

2087

initlogger(level)

2243

2088

2244

2089

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

2245

2090

syslogger.setFormatter(logging.Formatter

2246

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

2247

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

2248

.format(server_settings

2249

["servicename"])))

2091

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

2092

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

2093

% server_settings["servicename"]))

2250

2094

2251

2095

# Parse config file with clients

2252

client_config = configparser.SafeConfigParser(Client

2253

.client_defaults)

2096

client_config = configparser.SafeConfigParser(Client.client_defaults)

2254

2097

client_config.read(os.path.join(server_settings["configdir"],

2255

2098

"clients.conf"))

2256

2099

2270

2113

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

2271

2114

try:

2272

2115

pidfile = open(pidfilename, "w")

2273

except IOError as e:

2274

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

2275

exc_info=e)

2116

except IOError:

2117

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

2276

2118

2277

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

2119

try:

2120

uid = pwd.getpwnam("_mandos").pw_uid

2121

gid = pwd.getpwnam("_mandos").pw_gid

2122

except KeyError:

2278

2123

try:

2279

uid = pwd.getpwnam(name).pw_uid

2280

gid = pwd.getpwnam(name).pw_gid

2281

break

2124

uid = pwd.getpwnam("mandos").pw_uid

2125

gid = pwd.getpwnam("mandos").pw_gid

2282

2126

except KeyError:

2283

continue

2284

else:

2285

uid = 65534

2286

gid = 65534

2127

try:

2128

uid = pwd.getpwnam("nobody").pw_uid

2129

gid = pwd.getpwnam("nobody").pw_gid

2130

except KeyError:

2131

uid = 65534

2132

gid = 65534

2287

2133

try:

2288

2134

os.setgid(gid)

2289

2135

os.setuid(uid)

2306

2152

.gnutls_global_set_log_function(debug_gnutls))

2307

2153

2308

2154

# Redirect stdin so all checkers get /dev/null

2309

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

2155

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

2310

2156

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

2311

2157

if null > 2:

2312

2158

os.close(null)

2159

else:

2160

# No console logging

2161

logger.removeHandler(console)

2313

2162

2314

2163

# Need to fork before connecting to D-Bus

2315

2164

if not debug:

2316

2165

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

2317

2166

daemon()

2318

2167

2319

gobject.threads_init()

2320

2321

2168

global main_loop

2322

2169

# From the Avahi example code

2323

DBusGMainLoop(set_as_default=True)

2170

DBusGMainLoop(set_as_default=True )

2324

2171

main_loop = gobject.MainLoop()

2325

2172

bus = dbus.SystemBus()

2326

2173

# End of Avahi example code

2332

2179

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

2333

2180

do_not_queue=True))

2334

2181

except dbus.exceptions.NameExistsException as e:

2335

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

2182

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

2336

2183

use_dbus = False

2337

2184

server_settings["use_dbus"] = False

2338

2185

tcp_server.use_dbus = False

2350

2197

2351

2198

client_class = Client

2352

2199

if use_dbus:

2353

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

2200

client_class = functools.partial(ClientDBusTransitional,

2201

bus = bus)

2354

2202

2355

2203

client_settings = Client.config_parser(client_config)

2356

2204

old_client_settings = {}

2364

2212

(stored_state))

2365

2213

os.remove(stored_state_path)

2366

2214

except IOError as e:

2367

if e.errno == errno.ENOENT:

2368

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

2369

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

2370

else:

2371

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

2372

exc_info=e)

2215

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

2216

.format(e))

2217

if e.errno != errno.ENOENT:

2373

2218

raise

2374

except EOFError as e:

2375

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

2376

"EOFError:", exc_info=e)

2377

2219

2378

2220

with PGPEngine() as pgp:

2379

2221

for client_name, client in clients_data.iteritems():

2396

2238

2397

2239

# Clients who has passed its expire date can still be

2398

2240

# enabled if its last checker was successful. Clients

2399

# whose checker succeeded before we stored its state is

2400

# assumed to have successfully run all checkers during

2401

# downtime.

2241

# whose checker failed before we stored its state is

2242

# assumed to have failed all checkers during downtime.

2402

2243

if client["enabled"]:

2403

2244

if datetime.datetime.utcnow() >= client["expires"]:

2404

2245

if not client["last_checked_ok"]:

2405

2246

logger.warning(

2406

2247

"disabling client {0} - Client never "

2407

"performed a successful checker"

2408

.format(client_name))

2248

"performed a successfull checker"

2249

.format(client["name"]))

2409

2250

client["enabled"] = False

2410

2251

elif client["last_checker_status"] != 0:

2411

2252

logger.warning(

2412

2253

"disabling client {0} - Client "

2413

2254

"last checker failed with error code {1}"

2414

.format(client_name,

2255

.format(client["name"],

2415

2256

client["last_checker_status"]))

2416

2257

client["enabled"] = False

2417

2258

else:

2418

2259

client["expires"] = (datetime.datetime

2419

2260

.utcnow()

2420

2261

+ client["timeout"])

2421

logger.debug("Last checker succeeded,"

2422

" keeping {0} enabled"

2423

.format(client_name))

2262

2424

2263

try:

2425

2264

client["secret"] = (

2426

2265

pgp.decrypt(client["encrypted_secret"],

2432

2271

.format(client_name))

2433

2272

client["secret"] = (

2434

2273

client_settings[client_name]["secret"])

2274

2435

2275

2436

2276

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

2437

for client_name in (set(old_client_settings)

2438

- set(client_settings)):

2277

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

2439

2278

del clients_data[client_name]

2440

for client_name in (set(client_settings)

2441

- set(old_client_settings)):

2279

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

2442

2280

clients_data[client_name] = client_settings[client_name]

2443

2444

# Create all client objects

2281

2282

# Create clients all clients

2445

2283

for client_name, client in clients_data.iteritems():

2446

2284

tcp_server.clients[client_name] = client_class(

2447

2285

name = client_name, settings = client)

2448

2286

2449

2287

if not tcp_server.clients:

2450

2288

logger.warning("No clients defined")

2451

2289

2452

2290

if not debug:

2453

2291

try:

2454

2292

with pidfile:

2468

2306

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

2469

2307

2470

2308

if use_dbus:

2471

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

2472

"se.bsnet.fukt.Mandos"})

2473

class MandosDBusService(DBusObjectWithProperties):

2309

class MandosDBusService(dbus.service.Object):

2474

2310

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

2475

2311

def __init__(self):

2476

2312

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

2477

2313

_interface = "se.recompile.Mandos"

2478

2314

2479

@dbus_interface_annotations(_interface)

2480

def _foo(self):

2481

return { "org.freedesktop.DBus.Property"

2482

".EmitsChangedSignal":

2483

"false"}

2484

2485

2315

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

2486

2316

def ClientAdded(self, objpath):

2487

2317

"D-Bus signal"

2529

2359

2530

2360

del _interface

2531

2361

2532

mandos_dbus_service = MandosDBusService()

2362

class MandosDBusServiceTransitional(MandosDBusService):

2363

__metaclass__ = AlternateDBusNamesMetaclass

2364

mandos_dbus_service = MandosDBusServiceTransitional()

2533

2365

2534

2366

def cleanup():

2535

2367

"Cleanup function; run on exit"

2568

2400

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

2569

2401

2570

2402

try:

2571

with (tempfile.NamedTemporaryFile

2572

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

2573

dir=os.path.dirname(stored_state_path),

2574

delete=False)) as stored_state:

2403

with os.fdopen(os.open(stored_state_path,

2404

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

2405

0600), "wb") as stored_state:

2575

2406

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

2576

tempname=stored_state.name

2577

os.rename(tempname, stored_state_path)

2578

2407

except (IOError, OSError) as e:

2579

if not debug:

2580

try:

2581

os.remove(tempname)

2582

except NameError:

2583

pass

2584

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

2585

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

2586

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

2587

else:

2588

logger.warning("Could not save persistent state:",

2589

exc_info=e)

2590

raise e

2408

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

2409

.format(e))

2410

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

2411

raise

2591

2412

2592

2413

# Delete all clients, and settings from config

2593

2414

while tcp_server.clients:

2620

2441

service.port = tcp_server.socket.getsockname()[1]

2621

2442

if use_ipv6:

2622

2443

logger.info("Now listening on address %r, port %d,"

2623

" flowinfo %d, scope_id %d",

2624

*tcp_server.socket.getsockname())

2444

" flowinfo %d, scope_id %d"

2445

% tcp_server.socket.getsockname())

2625

2446

else: # IPv4

2626

logger.info("Now listening on address %r, port %d",

2627

*tcp_server.socket.getsockname())

2447

logger.info("Now listening on address %r, port %d"

2448

% tcp_server.socket.getsockname())

2628

2449

2629

2450

#service.interface = tcp_server.socket.getsockname()[3]

2630

2451

2633

2454

try:

2634

2455

service.activate()

2635

2456

except dbus.exceptions.DBusException as error:

2636

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

2457

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

2637

2458

cleanup()

2638

2459

sys.exit(1)

2639

2460

# End of Avahi example code

2646

2467

logger.debug("Starting main loop")

2647

2468

main_loop.run()

2648

2469

except AvahiError as error:

2649

logger.critical("Avahi Error", exc_info=error)

2470

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

2650

2471

cleanup()

2651

2472

sys.exit(1)

2652

2473

except KeyboardInterrupt: