/mandos/trunk : revision 659

1

#!/usr/bin/python2.7

1

#!/usr/bin/python

2

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

3

#

4

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

11

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

12

#

13

# Everything else is

14

15

14

15

16

#

17

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

18

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

36

37

from future_builtins import *

38

39

try:

40

import SocketServer as socketserver

41

except ImportError:

42

import socketserver

39

import SocketServer as socketserver

43

40

import socket

44

41

import argparse

45

42

import datetime

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

101

88

except ImportError:

102

89

SO_BINDTODEVICE = None

103

90

104

if sys.version_info.major == 2:

105

str = unicode

106

107

version = "1.6.9"

91

version = "1.6.4"

108

92

stored_state_file = "clients.pickle"

109

93

110

94

logger = logging.getLogger()

111

95

syslogger = None

112

96

113

97

try:

114

if_nametoindex = ctypes.cdll.LoadLibrary(

115

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

98

if_nametoindex = (ctypes.cdll.LoadLibrary

99

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

100

.if_nametoindex)

116

101

except (OSError, AttributeError):

117

118

102

def if_nametoindex(interface):

119

103

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

120

104

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

121

105

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

122

106

ifreq = fcntl.ioctl(s, SIOCGIFINDEX,

123

struct.pack(b"16s16x", interface))

124

interface_index = struct.unpack("I", ifreq[16:20])[0]

107

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

108

interface))

109

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

110

ifreq[16:20])[0]

125

111

return interface_index

126

112

127

113

128

114

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

129

115

"""init logger and add loglevel"""

130

116

131

global syslogger

132

syslogger = (logging.handlers.SysLogHandler(

133

facility = logging.handlers.SysLogHandler.LOG_DAEMON,

134

address = "/dev/log"))

117

syslogger = (logging.handlers.SysLogHandler

118

(facility =

119

logging.handlers.SysLogHandler.LOG_DAEMON,

120

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

135

121

syslogger.setFormatter(logging.Formatter

136

122

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

137

123

' %(message)s'))

154

140

155

141

class PGPEngine(object):

156

142

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

157

158

143

def __init__(self):

159

144

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

160

145

self.gnupgargs = ['--batch',

199

184

200

185

def encrypt(self, data, password):

201

186

passphrase = self.password_encode(password)

202

with tempfile.NamedTemporaryFile(

203

dir=self.tempdir) as passfile:

187

with tempfile.NamedTemporaryFile(dir=self.tempdir

188

) as passfile:

204

189

passfile.write(passphrase)

205

190

passfile.flush()

206

191

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

217

202

218

203

def decrypt(self, data, password):

219

204

passphrase = self.password_encode(password)

220

with tempfile.NamedTemporaryFile(

221

dir = self.tempdir) as passfile:

205

with tempfile.NamedTemporaryFile(dir = self.tempdir

206

) as passfile:

222

207

passfile.write(passphrase)

223

208

passfile.flush()

224

209

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

228

213

stdin = subprocess.PIPE,

229

214

stdout = subprocess.PIPE,

230

215

stderr = subprocess.PIPE)

231

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

216

decrypted_plaintext, err = proc.communicate(input

217

= data)

232

218

if proc.returncode != 0:

233

219

raise PGPError(err)

234

220

return decrypted_plaintext

237

223

class AvahiError(Exception):

238

224

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

239

225

self.value = value

240

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

241

**kwargs)

242

226

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

227

def __unicode__(self):

228

return unicode(repr(self.value))

243

229

244

230

class AvahiServiceError(AvahiError):

245

231

pass

246

232

247

248

233

class AvahiGroupError(AvahiError):

249

234

pass

250

235

270

255

bus: dbus.SystemBus()

271

256

"""

272

257

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):

258

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

259

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

260

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

261

protocol = avahi.PROTO_UNSPEC, bus = None):

284

262

self.interface = interface

285

263

self.name = name

286

264

self.type = servicetype

296

274

self.bus = bus

297

275

self.entry_group_state_changed_match = None

298

276

299

def rename(self, remove=True):

277

def rename(self):

300

278

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

301

279

if self.rename_count >= self.max_renames:

302

280

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

303

281

" after %i retries, exiting.",

304

282

self.rename_count)

305

283

raise AvahiServiceError("Too many renames")

306

self.name = str(

307

self.server.GetAlternativeServiceName(self.name))

308

self.rename_count += 1

284

self.name = unicode(self.server

285

.GetAlternativeServiceName(self.name))

309

286

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

310

287

self.name)

311

if remove:

312

self.remove()

288

self.remove()

313

289

try:

314

290

self.add()

315

291

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)

292

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

293

self.cleanup()

294

os._exit(1)

295

self.rename_count += 1

324

296

325

297

def remove(self):

326

298

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

364

336

self.rename()

365

337

elif state == avahi.ENTRY_GROUP_FAILURE:

366

338

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

367

str(error))

368

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

339

unicode(error))

340

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

341

.format(error))

369

342

370

343

def cleanup(self):

371

344

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

381

354

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

382

355

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

383

356

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

}

357

bad_states = { avahi.SERVER_INVALID:

358

"Zeroconf server invalid",

359

avahi.SERVER_REGISTERING: None,

360

avahi.SERVER_COLLISION:

361

"Zeroconf server name collision",

362

avahi.SERVER_FAILURE:

363

"Zeroconf server failure" }

390

364

if state in bad_states:

391

365

if bad_states[state] is not None:

392

366

if error is None:

411

385

follow_name_owner_changes=True),

412

386

avahi.DBUS_INTERFACE_SERVER)

413

387

self.server.connect_to_signal("StateChanged",

414

self.server_state_changed)

388

self.server_state_changed)

415

389

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

416

390

417

391

418

392

class AvahiServiceToSyslog(AvahiService):

419

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

393

def rename(self):

420

394

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

395

ret = AvahiService.rename(self)

396

syslogger.setFormatter(logging.Formatter

397

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

398

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

399

.format(self.name)))

425

400

return ret

426

401

427

402

403

def timedelta_to_milliseconds(td):

404

"Convert a datetime.timedelta() to milliseconds"

405

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

406

+ (td.seconds * 1000)

407

+ (td.microseconds // 1000))

408

409

428

410

class Client(object):

429

411

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

430

412

474

456

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

475

457

"last_approval_request", "last_checked_ok",

476

458

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

477

client_defaults = {

478

"timeout": "PT5M",

479

"extended_timeout": "PT15M",

480

"interval": "PT2M",

481

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

482

"host": "",

483

"approval_delay": "PT0S",

484

"approval_duration": "PT1S",

485

"approved_by_default": "True",

486

"enabled": "True",

487

}

459

client_defaults = { "timeout": "PT5M",

460

"extended_timeout": "PT15M",

461

"interval": "PT2M",

462

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

463

"host": "",

464

"approval_delay": "PT0S",

465

"approval_duration": "PT1S",

466

"approved_by_default": "True",

467

"enabled": "True",

468

}

469

470

def timeout_milliseconds(self):

471

"Return the 'timeout' attribute in milliseconds"

472

return timedelta_to_milliseconds(self.timeout)

473

474

def extended_timeout_milliseconds(self):

475

"Return the 'extended_timeout' attribute in milliseconds"

476

return timedelta_to_milliseconds(self.extended_timeout)

477

478

def interval_milliseconds(self):

479

"Return the 'interval' attribute in milliseconds"

480

return timedelta_to_milliseconds(self.interval)

481

482

def approval_delay_milliseconds(self):

483

return timedelta_to_milliseconds(self.approval_delay)

488

484

489

485

@staticmethod

490

486

def config_parser(config):

506

502

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

507

503

"enabled")

508

504

509

# Uppercase and remove spaces from fingerprint for later

510

# comparison purposes with return value from the

511

# fingerprint() function

512

505

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

513

506

.replace(" ", ""))

514

507

if "secret" in section:

519

512

"rb") as secfile:

520

513

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

521

514

else:

522

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

515

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

523

516

.format(section))

524

517

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

525

518

client["extended_timeout"] = string_to_delta(

542

535

server_settings = {}

543

536

self.server_settings = server_settings

544

537

# adding all client settings

545

for setting, value in settings.items():

538

for setting, value in settings.iteritems():

546

539

setattr(self, setting, value)

547

540

548

541

if self.enabled:

556

549

self.expires = None

557

550

558

551

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

552

# Uppercase and remove spaces from fingerprint for later

553

# comparison purposes with return value from the fingerprint()

554

# function

559

555

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

560

556

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

561

557

datetime.datetime.utcnow())

568

564

self.current_checker_command = None

569

565

self.approved = None

570

566

self.approvals_pending = 0

571

self.changedstate = multiprocessing_manager.Condition(

572

multiprocessing_manager.Lock())

573

self.client_structure = [attr

574

for attr in self.__dict__.iterkeys()

567

self.changedstate = (multiprocessing_manager

568

.Condition(multiprocessing_manager

569

.Lock()))

570

self.client_structure = [attr for attr in

571

self.__dict__.iterkeys()

575

572

if not attr.startswith("_")]

576

573

self.client_structure.append("client_structure")

577

574

578

for name, t in inspect.getmembers(

579

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

575

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

576

lambda obj:

577

isinstance(obj,

578

property)):

580

579

if not name.startswith("_"):

581

580

self.client_structure.append(name)

582

581

624

623

# and every interval from then on.

625

624

if self.checker_initiator_tag is not None:

626

625

gobject.source_remove(self.checker_initiator_tag)

627

self.checker_initiator_tag = gobject.timeout_add(

628

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

629

self.start_checker)

626

self.checker_initiator_tag = (gobject.timeout_add

627

(self.interval_milliseconds(),

628

self.start_checker))

630

629

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

631

630

if self.disable_initiator_tag is not None:

632

631

gobject.source_remove(self.disable_initiator_tag)

633

self.disable_initiator_tag = gobject.timeout_add(

634

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

632

self.disable_initiator_tag = (gobject.timeout_add

633

(self.timeout_milliseconds(),

634

self.disable))

635

# Also start a new checker *right now*.

636

self.start_checker()

637

646

vars(self))

647

self.checked_ok()

648

else:

649

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

649

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

650

vars(self))

650

651

else:

651

652

self.last_checker_status = -1

652

653

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

666

667

gobject.source_remove(self.disable_initiator_tag)

667

668

self.disable_initiator_tag = None

668

669

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

669

self.disable_initiator_tag = gobject.timeout_add(

670

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

670

self.disable_initiator_tag = (gobject.timeout_add

671

(timedelta_to_milliseconds

672

(timeout), self.disable))

671

673

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

672

674

673

675

def need_approval(self):

704

706

# Start a new checker if needed

705

707

if self.checker is None:

706

708

# Escape attributes for the shell

707

escaped_attrs = {

708

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

709

for attr in self.runtime_expansions }

709

escaped_attrs = dict(

710

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

711

for attr in

712

self.runtime_expansions)

710

713

try:

711

714

command = self.checker_command % escaped_attrs

712

715

except TypeError as error:

713

716

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

714

self.checker_command,

715

exc_info=error)

716

return True # Try again later

717

self.checker_command, exc_info=error)

718

return True # Try again later

717

719

self.current_checker_command = command

718

720

try:

719

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

720

self.name)

721

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

722

command, self.name)

721

723

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

722

724

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

723

725

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

732

734

"stderr": wnull })

733

735

self.checker = subprocess.Popen(command,

734

736

close_fds=True,

735

shell=True,

736

cwd="/",

737

shell=True, cwd="/",

737

738

**popen_args)

738

739

except OSError as error:

739

740

logger.error("Failed to start subprocess",

740

741

exc_info=error)

741

742

return True

742

self.checker_callback_tag = gobject.child_watch_add(

743

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

743

self.checker_callback_tag = (gobject.child_watch_add

744

(self.checker.pid,

745

self.checker_callback,

746

data=command))

744

747

# The checker may have completed before the gobject

745

748

# watch was added. Check for this.

746

749

try:

777

780

self.checker = None

778

781

779

782

780

def dbus_service_property(dbus_interface,

781

signature="v",

782

access="readwrite",

783

byte_arrays=False):

783

def dbus_service_property(dbus_interface, signature="v",

784

access="readwrite", byte_arrays=False):

784

785

"""Decorators for marking methods of a DBusObjectWithProperties to

785

786

become properties on the D-Bus.

786

787

795

796

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

796

797

if byte_arrays and signature != "ay":

797

798

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

798

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

799

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

800

def decorator(func):

801

func._dbus_is_property = True

802

func._dbus_interface = dbus_interface

807

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

808

func._dbus_get_args_options = {'byte_arrays': byte_arrays }

809

return func

810

811

810

return decorator

812

811

813

812

822

821

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

823

822

"false"}

824

823

"""

825

826

824

def decorator(func):

827

825

func._dbus_is_interface = True

828

826

func._dbus_interface = dbus_interface

829

827

func._dbus_name = dbus_interface

830

828

return func

831

832

829

return decorator

833

830

834

831

836

833

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

837

834

Usage:

838

835

839

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

840

"org.freedesktop.DBus.Property."

841

"EmitsChangedSignal": "false"})

842

836

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

843

837

access="r")

838

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

839

"org.freedesktop.DBus.Property."

840

"EmitsChangedSignal": "false"})

844

841

def Property_dbus_property(self):

845

842

return dbus.Boolean(False)

846

843

"""

847

848

844

def decorator(func):

849

845

func._dbus_annotations = annotations

850

846

return func

851

852

847

return decorator

853

848

854

849

855

850

class DBusPropertyException(dbus.exceptions.DBusException):

856

851

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

857

852

"""

858

pass

853

def __unicode__(self):

854

return unicode(str(self))

859

855

860

856

861

857

class DBusPropertyAccessException(DBusPropertyException):

885

881

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

886

882

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

887

883

"""

888

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

884

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

889

885

False)

890

886

891

887

def _get_all_dbus_things(self, thing):

892

888

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

893

889

"""

894

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

890

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

891

name),

895

892

athing.__get__(self))

896

893

for cls in self.__class__.__mro__

897

894

for name, athing in

898

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

895

inspect.getmembers(cls,

896

self._is_dbus_thing(thing)))

899

897

900

898

def _get_dbus_property(self, interface_name, property_name):

901

899

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

902

900

property with the specified name and interface.

903

901

"""

904

for cls in self.__class__.__mro__:

905

for name, value in inspect.getmembers(

906

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

902

for cls in self.__class__.__mro__:

903

for name, value in (inspect.getmembers

904

(cls,

905

self._is_dbus_thing("property"))):

907

906

if (value._dbus_name == property_name

908

907

and value._dbus_interface == interface_name):

909

908

return value.__get__(self)

910

909

911

910

# No such property

912

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

913

self.dbus_object_path, interface_name, property_name))

911

raise DBusPropertyNotFound(self.dbus_object_path + ":"

912

+ interface_name + "."

913

+ property_name)

914

915

@dbus.service.method(dbus.PROPERTIES_IFACE,

916

in_signature="ss",

915

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

917

916

out_signature="v")

918

917

def Get(self, interface_name, property_name):

919

918

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

938

937

# signatures other than "ay".

939

938

if prop._dbus_signature != "ay":

940

939

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

941

"'ay' signature {!r}"

940

"'ay' signature {0!r}"

942

941

.format(prop._dbus_signature))

943

942

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

944

943

for byte in value))

945

944

prop(value)

946

945

947

@dbus.service.method(dbus.PROPERTIES_IFACE,

948

in_signature="s",

946

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

949

947

out_signature="a{sv}")

950

948

def GetAll(self, interface_name):

951

949

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

966

964

if not hasattr(value, "variant_level"):

967

965

properties[name] = value

968

966

continue

969

properties[name] = type(value)(

970

value, variant_level = value.variant_level + 1)

967

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

968

value.variant_level+1)

971

969

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

972

970

973

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

974

def PropertiesChanged(self, interface_name, changed_properties,

975

invalidated_properties):

976

"""Standard D-Bus PropertiesChanged() signal, see D-Bus

977

standard.

978

"""

979

pass

980

981

971

@dbus.service.method(dbus.INTROSPECTABLE_IFACE,

982

972

out_signature="s",

983

973

path_keyword='object_path',

991

981

connection)

992

982

try:

993

983

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

994

995

984

def make_tag(document, name, prop):

996

985

e = document.createElement("property")

997

986

e.setAttribute("name", name)

998

987

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

999

988

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

1000

989

return e

1001

1002

990

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

1003

991

# Add property tags

1004

992

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

1016

1004

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

1017

1005

and prop._dbus_interface

1018

1006

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

1019

annots.update(getattr(

1020

prop, "_dbus_annotations", {}))

1021

for name, value in annots.items():

1007

annots.update(getattr

1008

(prop,

1009

"_dbus_annotations",

1010

{}))

1011

for name, value in annots.iteritems():

1022

1012

ann_tag = document.createElement(

1023

1013

"annotation")

1024

1014

ann_tag.setAttribute("name", name)

1027

1017

# Add interface annotation tags

1028

1018

for annotation, value in dict(

1029

1019

itertools.chain.from_iterable(

1030

annotations().items()

1031

for name, annotations

1032

in self._get_all_dbus_things("interface")

1020

annotations().iteritems()

1021

for name, annotations in

1022

self._get_all_dbus_things("interface")

1033

1023

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

1034

)).items():

1024

)).iteritems():

1035

1025

ann_tag = document.createElement("annotation")

1036

1026

ann_tag.setAttribute("name", annotation)

1037

1027

ann_tag.setAttribute("value", value)

1064

1054

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

1065

1055

if dt is None:

1066

1056

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

1067

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

1057

return dbus.String(dt.isoformat(),

1058

variant_level=variant_level)

1068

1059

1069

1060

1070

1061

def alternate_dbus_interfaces(alt_interface_names, deprecate=True):

1090

1081

(from DBusObjectWithProperties) and interfaces (from the

1091

1082

dbus_interface_annotations decorator).

1092

1083

"""

1093

1094

1084

def wrapper(cls):

1095

1085

for orig_interface_name, alt_interface_name in (

1096

alt_interface_names.items()):

1086

alt_interface_names.iteritems()):

1097

1087

attr = {}

1098

1088

interface_names = set()

1099

1089

# Go though all attributes of the class

1101

1091

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

1102

1092

# with the wrong interface name

1103

1093

if (not hasattr(attribute, "_dbus_interface")

1104

or not attribute._dbus_interface.startswith(

1105

orig_interface_name)):

1094

or not attribute._dbus_interface

1095

.startswith(orig_interface_name)):

1106

1096

continue

1107

1097

# Create an alternate D-Bus interface name based on

1108

1098

# the current name

1109

alt_interface = attribute._dbus_interface.replace(

1110

orig_interface_name, alt_interface_name)

1099

alt_interface = (attribute._dbus_interface

1100

.replace(orig_interface_name,

1101

alt_interface_name))

1111

1102

interface_names.add(alt_interface)

1112

1103

# Is this a D-Bus signal?

1113

1104

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

1114

1105

# Extract the original non-method undecorated

1115

1106

# function by black magic

1116

1107

nonmethod_func = (dict(

1117

zip(attribute.func_code.co_freevars,

1118

attribute.__closure__))

1119

["func"].cell_contents)

1108

zip(attribute.func_code.co_freevars,

1109

attribute.__closure__))["func"]

1110

.cell_contents)

1120

1111

# Create a new, but exactly alike, function

1121

1112

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

1122

1113

# with the alternate D-Bus interface name

1123

new_function = (dbus.service.signal(

1124

alt_interface, attribute._dbus_signature)

1114

new_function = (dbus.service.signal

1115

(alt_interface,

1116

attribute._dbus_signature)

1125

1117

(types.FunctionType(

1126

nonmethod_func.func_code,

1127

nonmethod_func.func_globals,

1128

nonmethod_func.func_name,

1129

nonmethod_func.func_defaults,

1130

nonmethod_func.func_closure)))

1118

nonmethod_func.func_code,

1119

nonmethod_func.func_globals,

1120

nonmethod_func.func_name,

1121

nonmethod_func.func_defaults,

1122

nonmethod_func.func_closure)))

1131

1123

# Copy annotations, if any

1132

1124

try:

1133

new_function._dbus_annotations = dict(

1134

attribute._dbus_annotations)

1125

new_function._dbus_annotations = (

1126

dict(attribute._dbus_annotations))

1135

1127

except AttributeError:

1136

1128

pass

1137

1129

# Define a creator of a function to call both the

1142

1134

"""This function is a scope container to pass

1143

1135

func1 and func2 to the "call_both" function

1144

1136

outside of its arguments"""

1145

1146

1137

def call_both(*args, **kwargs):

1147

1138

"""This function will emit two D-Bus

1148

1139

signals by calling func1 and func2"""

1149

1140

func1(*args, **kwargs)

1150

1141

func2(*args, **kwargs)

1151

1152

1142

return call_both

1153

1143

# Create the "call_both" function and add it to

1154

1144

# the class

1159

1149

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

1160

1150

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

1161

1151

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

1152

attr[attrname] = (dbus.service.method

1153

(alt_interface,

1154

attribute._dbus_in_signature,

1155

attribute._dbus_out_signature)

1156

(types.FunctionType

1157

(attribute.func_code,

1158

attribute.func_globals,

1159

attribute.func_name,

1160

attribute.func_defaults,

1161

attribute.func_closure)))

1172

1162

# Copy annotations, if any

1173

1163

try:

1174

attr[attrname]._dbus_annotations = dict(

1175

attribute._dbus_annotations)

1164

attr[attrname]._dbus_annotations = (

1165

dict(attribute._dbus_annotations))

1176

1166

except AttributeError:

1177

1167

pass

1178

1168

# Is this a D-Bus property?

1181

1171

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

1182

1172

# property with the alternate D-Bus interface

1183

1173

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

1174

attr[attrname] = (dbus_service_property

1175

(alt_interface,

1176

attribute._dbus_signature,

1177

attribute._dbus_access,

1178

attribute

1179

._dbus_get_args_options

1180

["byte_arrays"])

1181

(types.FunctionType

1182

(attribute.func_code,

1183

attribute.func_globals,

1184

attribute.func_name,

1185

attribute.func_defaults,

1186

attribute.func_closure)))

1195

1187

# Copy annotations, if any

1196

1188

try:

1197

attr[attrname]._dbus_annotations = dict(

1198

attribute._dbus_annotations)

1189

attr[attrname]._dbus_annotations = (

1190

dict(attribute._dbus_annotations))

1199

1191

except AttributeError:

1200

1192

pass

1201

1193

# Is this a D-Bus interface?

1204

1196

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

1205

1197

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

1206

1198

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

1199

attr[attrname] = (dbus_interface_annotations

1200

(alt_interface)

1201

(types.FunctionType

1202

(attribute.func_code,

1203

attribute.func_globals,

1204

attribute.func_name,

1205

attribute.func_defaults,

1206

attribute.func_closure)))

1214

1207

if deprecate:

1215

1208

# Deprecate all alternate interfaces

1216

iname="_AlternateDBusNames_interface_annotation{}"

1209

iname="_AlternateDBusNames_interface_annotation{0}"

1217

1210

for interface_name in interface_names:

1218

1219

1211

@dbus_interface_annotations(interface_name)

1220

1212

def func(self):

1221

1213

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

1222

"true" }

1214

"true" }

1223

1215

# Find an unused name

1224

1216

for aname in (iname.format(i)

1225

1217

for i in itertools.count()):

1229

1221

if interface_names:

1230

1222

# Replace the class with a new subclass of it with

1231

1223

# methods, signals, etc. as created above.

1232

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

1233

(cls, ), attr)

1224

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

1225

(cls,), attr)

1234

1226

return cls

1235

1236

1227

return wrapper

1237

1228

1238

1229

1239

1230

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

1240

"se.bsnet.fukt.Mandos"})

1231

"se.bsnet.fukt.Mandos"})

1241

1232

class ClientDBus(Client, DBusObjectWithProperties):

1242

1233

"""A Client class using D-Bus

1243

1234

1247

1238

"""

1248

1239

1249

1240

runtime_expansions = (Client.runtime_expansions

1250

+ ("dbus_object_path", ))

1251

1252

_interface = "se.recompile.Mandos.Client"

1241

+ ("dbus_object_path",))

1253

1242

1254

1243

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

1255

1244

1258

1247

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

1259

1248

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

1260

1249

# the D-Bus

1261

client_object_name = str(self.name).translate(

1250

client_object_name = unicode(self.name).translate(

1262

1251

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

1263

1252

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

1264

self.dbus_object_path = dbus.ObjectPath(

1265

"/clients/" + client_object_name)

1253

self.dbus_object_path = (dbus.ObjectPath

1254

("/clients/" + client_object_name))

1266

1255

DBusObjectWithProperties.__init__(self, self.bus,

1267

1256

self.dbus_object_path)

1268

1257

1269

def notifychangeproperty(transform_func, dbus_name,

1270

type_func=lambda x: x,

1271

variant_level=1,

1272

invalidate_only=False,

1273

_interface=_interface):

1258

def notifychangeproperty(transform_func,

1259

dbus_name, type_func=lambda x: x,

1260

variant_level=1):

1274

1261

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

1275

1262

its changes to DBus.

1276

1263

1281

1268

to the D-Bus. Default: no transform

1282

1269

variant_level: D-Bus variant level. Default: 1

1283

1270

"""

1284

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

1285

1271

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

1286

1272

def setter(self, value):

1287

1273

if hasattr(self, "dbus_object_path"):

1288

1274

if (not hasattr(self, attrname) or

1289

1275

type_func(getattr(self, attrname, None))

1290

1276

!= type_func(value)):

1291

if invalidate_only:

1292

self.PropertiesChanged(

1293

_interface, dbus.Dictionary(),

1294

dbus.Array((dbus_name, )))

1295

else:

1296

dbus_value = transform_func(

1297

type_func(value),

1298

variant_level = variant_level)

1299

self.PropertyChanged(dbus.String(dbus_name),

1300

dbus_value)

1301

self.PropertiesChanged(

1302

_interface,

1303

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

1304

dbus_value }),

1305

dbus.Array())

1277

dbus_value = transform_func(type_func(value),

1278

variant_level

1279

=variant_level)

1280

self.PropertyChanged(dbus.String(dbus_name),

1281

dbus_value)

1306

1282

setattr(self, attrname, value)

1307

1283

1308

1284

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

1314

1290

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

1315

1291

last_enabled = notifychangeproperty(datetime_to_dbus,

1316

1292

"LastEnabled")

1317

checker = notifychangeproperty(

1318

dbus.Boolean, "CheckerRunning",

1319

type_func = lambda checker: checker is not None)

1293

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

1294

type_func = lambda checker:

1295

checker is not None)

1320

1296

last_checked_ok = notifychangeproperty(datetime_to_dbus,

1321

1297

"LastCheckedOK")

1322

1298

last_checker_status = notifychangeproperty(dbus.Int16,

1325

1301

datetime_to_dbus, "LastApprovalRequest")

1326

1302

approved_by_default = notifychangeproperty(dbus.Boolean,

1327

1303

"ApprovedByDefault")

1328

approval_delay = notifychangeproperty(

1329

dbus.UInt64, "ApprovalDelay",

1330

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

1304

approval_delay = notifychangeproperty(dbus.UInt64,

1305

"ApprovalDelay",

1306

type_func =

1307

timedelta_to_milliseconds)

1331

1308

approval_duration = notifychangeproperty(

1332

1309

dbus.UInt64, "ApprovalDuration",

1333

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

1310

type_func = timedelta_to_milliseconds)

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 =

1314

timedelta_to_milliseconds)

1338

1315

extended_timeout = notifychangeproperty(

1339

1316

dbus.UInt64, "ExtendedTimeout",

1340

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

1341

interval = notifychangeproperty(

1342

dbus.UInt64, "Interval",

1343

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

1317

type_func = timedelta_to_milliseconds)

1318

interval = notifychangeproperty(dbus.UInt64,

1319

"Interval",

1320

type_func =

1321

timedelta_to_milliseconds)

1344

1322

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

1345

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

1346

invalidate_only=True)

1347

1323

1348

1324

del notifychangeproperty

1349

1325

1391

1367

1392

1368

def approve(self, value=True):

1393

1369

self.approved = value

1394

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

1395

* 1000), self._reset_approved)

1370

gobject.timeout_add(timedelta_to_milliseconds

1371

(self.approval_duration),

1372

self._reset_approved)

1396

1373

self.send_changedstate()

1397

1374

1398

1375

## D-Bus methods, signals & properties

1376

_interface = "se.recompile.Mandos.Client"

1399

1377

1400

1378

## Interfaces

1401

1379

1380

@dbus_interface_annotations(_interface)

1381

def _foo(self):

1382

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

1383

"false"}

1384

1402

1385

## Signals

1403

1386

1404

1387

# CheckerCompleted - signal

1414

1397

pass

1415

1398

1416

1399

# PropertyChanged - signal

1417

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

1418

1400

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

1419

1401

def PropertyChanged(self, property, value):

1420

1402

"D-Bus signal"

1484

1466

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

1485

1467

1486

1468

# ApprovedByDefault - property

1487

@dbus_service_property(_interface,

1488

signature="b",

1469

@dbus_service_property(_interface, signature="b",

1489

1470

access="readwrite")

1490

1471

def ApprovedByDefault_dbus_property(self, value=None):

1491

1472

if value is None: # get

1493

1474

self.approved_by_default = bool(value)

1494

1475

1495

1476

# ApprovalDelay - property

1496

@dbus_service_property(_interface,

1497

signature="t",

1477

@dbus_service_property(_interface, signature="t",

1498

1478

access="readwrite")

1499

1479

def ApprovalDelay_dbus_property(self, value=None):

1500

1480

if value is None: # get

1501

return dbus.UInt64(self.approval_delay.total_seconds()

1502

* 1000)

1481

return dbus.UInt64(self.approval_delay_milliseconds())

1503

1482

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

1504

1483

1505

1484

# ApprovalDuration - property

1506

@dbus_service_property(_interface,

1507

signature="t",

1485

@dbus_service_property(_interface, signature="t",

1508

1486

access="readwrite")

1509

1487

def ApprovalDuration_dbus_property(self, value=None):

1510

1488

if value is None: # get

1511

return dbus.UInt64(self.approval_duration.total_seconds()

1512

* 1000)

1489

return dbus.UInt64(timedelta_to_milliseconds(

1490

self.approval_duration))

1513

1491

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

1514

1492

1515

1493

# Name - property

1523

1501

return dbus.String(self.fingerprint)

1524

1502

1525

1503

# Host - property

1526

@dbus_service_property(_interface,

1527

signature="s",

1504

@dbus_service_property(_interface, signature="s",

1528

1505

access="readwrite")

1529

1506

def Host_dbus_property(self, value=None):

1530

1507

if value is None: # get

1531

1508

return dbus.String(self.host)

1532

self.host = str(value)

1509

self.host = unicode(value)

1533

1510

1534

1511

# Created - property

1535

1512

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

1542

1519

return datetime_to_dbus(self.last_enabled)

1543

1520

1544

1521

# Enabled - property

1545

@dbus_service_property(_interface,

1546

signature="b",

1522

@dbus_service_property(_interface, signature="b",

1547

1523

access="readwrite")

1548

1524

def Enabled_dbus_property(self, value=None):

1549

1525

if value is None: # get

1554

1530

self.disable()

1555

1531

1556

1532

# LastCheckedOK - property

1557

@dbus_service_property(_interface,

1558

signature="s",

1533

@dbus_service_property(_interface, signature="s",

1559

1534

access="readwrite")

1560

1535

def LastCheckedOK_dbus_property(self, value=None):

1561

1536

if value is not None:

1564

1539

return datetime_to_dbus(self.last_checked_ok)

1565

1540

1566

1541

# LastCheckerStatus - property

1567

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

1542

@dbus_service_property(_interface, signature="n",

1543

access="read")

1568

1544

def LastCheckerStatus_dbus_property(self):

1569

1545

return dbus.Int16(self.last_checker_status)

1570

1546

1579

1555

return datetime_to_dbus(self.last_approval_request)

1580

1556

1581

1557

# Timeout - property

1582

@dbus_service_property(_interface,

1583

signature="t",

1558

@dbus_service_property(_interface, signature="t",

1584

1559

access="readwrite")

1585

1560

def Timeout_dbus_property(self, value=None):

1586

1561

if value is None: # get

1587

return dbus.UInt64(self.timeout.total_seconds() * 1000)

1562

return dbus.UInt64(self.timeout_milliseconds())

1588

1563

old_timeout = self.timeout

1589

1564

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

1590

1565

# Reschedule disabling

1599

1574

is None):

1600

1575

return

1601

1576

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)

1577

self.disable_initiator_tag = (

1578

gobject.timeout_add(

1579

timedelta_to_milliseconds(self.expires - now),

1580

self.disable))

1605

1581

1606

1582

# ExtendedTimeout - property

1607

@dbus_service_property(_interface,

1608

signature="t",

1583

@dbus_service_property(_interface, signature="t",

1609

1584

access="readwrite")

1610

1585

def ExtendedTimeout_dbus_property(self, value=None):

1611

1586

if value is None: # get

1612

return dbus.UInt64(self.extended_timeout.total_seconds()

1613

* 1000)

1587

return dbus.UInt64(self.extended_timeout_milliseconds())

1614

1588

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

1615

1589

1616

1590

# Interval - property

1617

@dbus_service_property(_interface,

1618

signature="t",

1591

@dbus_service_property(_interface, signature="t",

1619

1592

access="readwrite")

1620

1593

def Interval_dbus_property(self, value=None):

1621

1594

if value is None: # get

1622

return dbus.UInt64(self.interval.total_seconds() * 1000)

1595

return dbus.UInt64(self.interval_milliseconds())

1623

1596

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

1624

1597

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

1625

1598

return

1626

1599

if self.enabled:

1627

1600

# Reschedule checker run

1628

1601

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

1602

self.checker_initiator_tag = (gobject.timeout_add

1603

(value, self.start_checker))

1604

self.start_checker() # Start one now, too

1632

1605

1633

1606

# Checker - property

1634

@dbus_service_property(_interface,

1635

signature="s",

1607

@dbus_service_property(_interface, signature="s",

1636

1608

access="readwrite")

1637

1609

def Checker_dbus_property(self, value=None):

1638

1610

if value is None: # get

1639

1611

return dbus.String(self.checker_command)

1640

self.checker_command = str(value)

1612

self.checker_command = unicode(value)

1641

1613

1642

1614

# CheckerRunning - property

1643

@dbus_service_property(_interface,

1644

signature="b",

1615

@dbus_service_property(_interface, signature="b",

1645

1616

access="readwrite")

1646

1617

def CheckerRunning_dbus_property(self, value=None):

1647

1618

if value is None: # get

1657

1628

return self.dbus_object_path # is already a dbus.ObjectPath

1658

1629

1659

1630

# Secret = property

1660

@dbus_service_property(_interface,

1661

signature="ay",

1662

access="write",

1663

byte_arrays=True)

1631

@dbus_service_property(_interface, signature="ay",

1632

access="write", byte_arrays=True)

1664

1633

def Secret_dbus_property(self, value):

1665

self.secret = bytes(value)

1634

self.secret = str(value)

1666

1635

1667

1636

del _interface

1668

1637

1672

1641

self._pipe = child_pipe

1673

1642

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

1674

1643

if not self._pipe.recv():

1675

raise KeyError(fpr)

1644

raise KeyError()

1676

1645

1677

1646

def __getattribute__(self, name):

1678

1647

if name == '_pipe':

1682

1651

if data[0] == 'data':

1683

1652

return data[1]

1684

1653

if data[0] == 'function':

1685

1686

1654

def func(*args, **kwargs):

1687

1655

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

1688

1656

return self._pipe.recv()[1]

1689

1690

1657

return func

1691

1658

1692

1659

def __setattr__(self, name, value):

1704

1671

def handle(self):

1705

1672

with contextlib.closing(self.server.child_pipe) as child_pipe:

1706

1673

logger.info("TCP connection from: %s",

1707

str(self.client_address))

1674

unicode(self.client_address))

1708

1675

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

1709

1676

self.server.child_pipe.fileno())

1710

1677

1711

session = gnutls.connection.ClientSession(

1712

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

1678

session = (gnutls.connection

1679

.ClientSession(self.request,

1680

gnutls.connection

1681

.X509Credentials()))

1713

1682

1714

1683

# Note: gnutls.connection.X509Credentials is really a

1715

1684

# generic GnuTLS certificate credentials object so long as

1724

1693

priority = self.server.gnutls_priority

1725

1694

if priority is None:

1726

1695

priority = "NORMAL"

1727

gnutls.library.functions.gnutls_priority_set_direct(

1728

session._c_object, priority, None)

1696

(gnutls.library.functions

1697

.gnutls_priority_set_direct(session._c_object,

1698

priority, None))

1729

1699

1730

1700

# Start communication using the Mandos protocol

1731

1701

# Get protocol number

1751

1721

approval_required = False

1752

1722

try:

1753

1723

try:

1754

fpr = self.fingerprint(

1755

self.peer_certificate(session))

1724

fpr = self.fingerprint(self.peer_certificate

1725

(session))

1756

1726

except (TypeError,

1757

1727

gnutls.errors.GNUTLSError) as error:

1758

1728

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

1773

1743

while True:

1774

1744

if not client.enabled:

1775

1745

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

1776

client.name)

1746

client.name)

1777

1747

if self.server.use_dbus:

1778

1748

# Emit D-Bus signal

1779

1749

client.Rejected("Disabled")

1788

1758

if self.server.use_dbus:

1789

1759

# Emit D-Bus signal

1790

1760

client.NeedApproval(

1791

client.approval_delay.total_seconds()

1792

* 1000, client.approved_by_default)

1761

client.approval_delay_milliseconds(),

1762

client.approved_by_default)

1793

1763

else:

1794

1764

logger.warning("Client %s was not approved",

1795

1765

client.name)

1801

1771

#wait until timeout or approved

1802

1772

time = datetime.datetime.now()

1803

1773

client.changedstate.acquire()

1804

client.changedstate.wait(delay.total_seconds())

1774

client.changedstate.wait(

1775

float(timedelta_to_milliseconds(delay)

1776

/ 1000))

1805

1777

client.changedstate.release()

1806

1778

time2 = datetime.datetime.now()

1807

1779

if (time2 - time) >= delay:

1826

1798

logger.warning("gnutls send failed",

1827

1799

exc_info=error)

1828

1800

return

1829

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

1830

len(client.secret) - (sent_size

1831

+ sent))

1801

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

1802

sent, len(client.secret)

1803

- (sent_size + sent))

1832

1804

sent_size += sent

1833

1805

1834

1806

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

1851

1823

def peer_certificate(session):

1852

1824

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

1853

1825

# If not an OpenPGP certificate...

1854

if (gnutls.library.functions.gnutls_certificate_type_get(

1855

session._c_object)

1826

if (gnutls.library.functions

1827

.gnutls_certificate_type_get(session._c_object)

1856

1828

!= gnutls.library.constants.GNUTLS_CRT_OPENPGP):

1857

1829

# ...do the normal thing

1858

1830

return session.peer_certificate

1872

1844

def fingerprint(openpgp):

1873

1845

"Convert an OpenPGP bytestring to a hexdigit fingerprint"

1874

1846

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

1847

datum = (gnutls.library.types

1848

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

1849

ctypes.POINTER

1850

(ctypes.c_ubyte)),

1851

ctypes.c_uint(len(openpgp))))

1879

1852

# New empty GnuTLS certificate

1880

1853

crt = gnutls.library.types.gnutls_openpgp_crt_t()

1881

gnutls.library.functions.gnutls_openpgp_crt_init(

1882

ctypes.byref(crt))

1854

(gnutls.library.functions

1855

.gnutls_openpgp_crt_init(ctypes.byref(crt)))

1883

1856

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

1857

(gnutls.library.functions

1858

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

1859

gnutls.library.constants

1860

.GNUTLS_OPENPGP_FMT_RAW))

1887

1861

# Verify the self signature in the key

1888

1862

crtverify = ctypes.c_uint()

1889

gnutls.library.functions.gnutls_openpgp_crt_verify_self(

1890

crt, 0, ctypes.byref(crtverify))

1863

(gnutls.library.functions

1864

.gnutls_openpgp_crt_verify_self(crt, 0,

1865

ctypes.byref(crtverify)))

1891

1866

if crtverify.value != 0:

1892

1867

gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)

1893

raise gnutls.errors.CertificateSecurityError(

1894

"Verify failed")

1868

raise (gnutls.errors.CertificateSecurityError

1869

("Verify failed"))

1895

1870

# New buffer for the fingerprint

1896

1871

buf = ctypes.create_string_buffer(20)

1897

1872

buf_len = ctypes.c_size_t()

1898

1873

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

1874

(gnutls.library.functions

1875

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

1876

ctypes.byref(buf_len)))

1901

1877

# Deinit the certificate

1902

1878

gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)

1903

1879

# Convert the buffer to a Python bytestring

1909

1885

1910

1886

class MultiprocessingMixIn(object):

1911

1887

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

1912

1913

1888

def sub_process_main(self, request, address):

1914

1889

try:

1915

1890

self.finish_request(request, address)

1927

1902

1928

1903

class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):

1929

1904

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

1930

1931

1905

def process_request(self, request, client_address):

1932

1906

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

1933

1907

1954

1928

interface: None or a network interface name (string)

1955

1929

use_ipv6: Boolean; to use IPv6 or not

1956

1930

"""

1957

1958

1931

def __init__(self, server_address, RequestHandlerClass,

1959

interface=None,

1960

use_ipv6=True,

1961

socketfd=None):

1932

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

1962

1933

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

1963

1934

creating a new one with socket.socket().

1964

1935

"""

2005

1976

self.interface)

2006

1977

else:

2007

1978

try:

2008

self.socket.setsockopt(

2009

socket.SOL_SOCKET, SO_BINDTODEVICE,

2010

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

1979

self.socket.setsockopt(socket.SOL_SOCKET,

1980

SO_BINDTODEVICE,

1981

str(self.interface + '\0'))

2011

1982

except socket.error as error:

2012

1983

if error.errno == errno.EPERM:

2013

1984

logger.error("No permission to bind to"

2031

2002

self.server_address = (any_address,

2032

2003

self.server_address[1])

2033

2004

elif not self.server_address[1]:

2034

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

2005

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

2006

0)

2035

2007

# if self.interface:

2036

2008

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

2037

2009

# 0, # port

2051

2023

2052

2024

Assumes a gobject.MainLoop event loop.

2053

2025

"""

2054

2055

2026

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):

2027

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

2028

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

2062

2029

self.enabled = False

2063

2030

self.clients = clients

2064

2031

if self.clients is None:

2070

2037

interface = interface,

2071

2038

use_ipv6 = use_ipv6,

2072

2039

socketfd = socketfd)

2073

2074

2040

def server_activate(self):

2075

2041

if self.enabled:

2076

2042

return socketserver.TCPServer.server_activate(self)

2080

2046

2081

2047

def add_pipe(self, parent_pipe, proc):

2082

2048

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

2049

gobject.io_add_watch(parent_pipe.fileno(),

2050

gobject.IO_IN | gobject.IO_HUP,

2051

functools.partial(self.handle_ipc,

2052

parent_pipe =

2053

parent_pipe,

2054

proc = proc))

2089

2055

2090

def handle_ipc(self, source, condition,

2091

parent_pipe=None,

2092

proc = None,

2093

client_object=None):

2056

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

2057

proc = None, client_object=None):

2094

2058

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

2095

2059

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

2096

2060

# Wait for other process to exit

2119

2083

parent_pipe.send(False)

2120

2084

return False

2121

2085

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))

2086

gobject.io_add_watch(parent_pipe.fileno(),

2087

gobject.IO_IN | gobject.IO_HUP,

2088

functools.partial(self.handle_ipc,

2089

parent_pipe =

2090

parent_pipe,

2091

proc = proc,

2092

client_object =

2093

client))

2129

2094

parent_pipe.send(True)

2130

2095

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

2131

2096

# same fileno

2137

2102

2138

2103

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

2139

2104

funcname)(*args,

2140

**kwargs)))

2105

**kwargs)))

2141

2106

2142

2107

if command == 'getattr':

2143

2108

attrname = request[1]

2144

2109

if callable(client_object.__getattribute__(attrname)):

2145

parent_pipe.send(('function', ))

2110

parent_pipe.send(('function',))

2146

2111

else:

2147

parent_pipe.send((

2148

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

2112

parent_pipe.send(('data', client_object

2113

.__getattribute__(attrname)))

2149

2114

2150

2115

if command == 'setattr':

2151

2116

attrname = request[1]

2182

2147

# avoid excessive use of external libraries.

2183

2148

2184

2149

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

2185

Token = collections.namedtuple("Token", (

2186

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

2187

# a "group" containing digits

2188

"value", # datetime.timedelta or None

2189

"followers")) # Tokens valid after this token

2150

Token = collections.namedtuple("Token",

2151

("regexp", # To match token; if

2152

# "value" is not None,

2153

# must have a "group"

2154

# containing digits

2155

"value", # datetime.timedelta or

2156

# None

2157

"followers")) # Tokens valid after

2158

# this token

2190

2159

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

2191

2160

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

2192

2161

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

2193

2162

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

2194

2163

datetime.timedelta(seconds=1),

2195

frozenset((token_end, )))

2164

frozenset((token_end,)))

2196

2165

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

2197

2166

datetime.timedelta(minutes=1),

2198

2167

frozenset((token_second, token_end)))

2214

2183

frozenset((token_month, token_end)))

2215

2184

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

2216

2185

datetime.timedelta(weeks=1),

2217

frozenset((token_end, )))

2186

frozenset((token_end,)))

2218

2187

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

2219

2188

frozenset((token_year, token_month,

2220

2189

token_day, token_time,

2221

token_week)))

2190

token_week))),

2222

2191

# Define starting values

2223

2192

value = datetime.timedelta() # Value so far

2224

2193

found_token = None

2225

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

2194

followers = frozenset(token_duration,) # Following valid tokens

2226

2195

s = duration # String left to parse

2227

2196

# Loop until end token is found

2228

2197

while found_token is not token_end:

2245

2214

break

2246

2215

else:

2247

2216

# No currently valid tokens were found

2248

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

2249

.format(duration))

2217

raise ValueError("Invalid RFC 3339 duration")

2250

2218

# End token found

2251

2219

return value

2252

2220

2276

2244

timevalue = datetime.timedelta(0)

2277

2245

for s in interval.split():

2278

2246

try:

2279

suffix = s[-1]

2247

suffix = unicode(s[-1])

2280

2248

value = int(s[:-1])

2281

2249

if suffix == "d":

2282

2250

delta = datetime.timedelta(value)

2289

2257

elif suffix == "w":

2290

2258

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

2291

2259

else:

2292

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

2260

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

2261

.format(suffix))

2293

2262

except IndexError as e:

2294

2263

raise ValueError(*(e.args))

2295

2264

timevalue += delta

2312

2281

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

2313

2282

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

2314

2283

raise OSError(errno.ENODEV,

2315

"{} not a character device"

2284

"{0} not a character device"

2316

2285

.format(os.devnull))

2317

2286

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

2318

2287

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

2328

2297

2329

2298

parser = argparse.ArgumentParser()

2330

2299

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

2331

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

2300

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

2332

2301

help="show version number and exit")

2333

2302

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

2334

2303

help="Bind to interface IF")

2367

2336

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

2368

2337

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

2369

2338

help="Run in foreground", default=None)

2370

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

2371

dest="zeroconf", help="Do not use Zeroconf",

2372

default=None)

2373

2339

2374

2340

options = parser.parse_args()

2375

2341

2384

2350

"port": "",

2385

2351

"debug": "False",

2386

2352

"priority":

2387

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

2388

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

2353

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

2389

2354

"servicename": "Mandos",

2390

2355

"use_dbus": "True",

2391

2356

"use_ipv6": "True",

2394

2359

"socket": "",

2395

2360

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

2396

2361

"foreground": "False",

2397

"zeroconf": "True",

2398

}

2362

}

2399

2363

2400

2364

# Parse config file for server-global settings

2401

2365

server_config = configparser.SafeConfigParser(server_defaults)

2402

2366

del server_defaults

2403

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

2367

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

2368

"mandos.conf"))

2404

2369

# Convert the SafeConfigParser object to a dict

2405

2370

server_settings = server_config.defaults()

2406

2371

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

2424

2389

# Override the settings from the config file with command line

2425

2390

# options, if set.

2426

2391

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

2427

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

2428

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

2429

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

2392

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

2393

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

2394

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

2430

2395

value = getattr(options, option)

2431

2396

if value is not None:

2432

2397

server_settings[option] = value

2433

2398

del options

2434

2399

# Force all strings to be unicode

2435

2400

for option in server_settings.keys():

2436

if isinstance(server_settings[option], bytes):

2437

server_settings[option] = (server_settings[option]

2438

.decode("utf-8"))

2401

if type(server_settings[option]) is str:

2402

server_settings[option] = unicode(server_settings[option])

2439

2403

# Force all boolean options to be boolean

2440

2404

for option in ("debug", "use_dbus", "use_ipv6", "restore",

2441

"foreground", "zeroconf"):

2405

"foreground"):

2442

2406

server_settings[option] = bool(server_settings[option])

2443

2407

# Debug implies foreground

2444

2408

if server_settings["debug"]:

2447

2411

2448

2412

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

2449

2413

2450

if (not server_settings["zeroconf"]

2451

and not (server_settings["port"]

2452

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

2453

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

2454

2455

2414

# For convenience

2456

2415

debug = server_settings["debug"]

2457

2416

debuglevel = server_settings["debuglevel"]

2460

2419

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

2461

2420

stored_state_file)

2462

2421

foreground = server_settings["foreground"]

2463

zeroconf = server_settings["zeroconf"]

2464

2422

2465

2423

if debug:

2466

2424

initlogger(debug, logging.DEBUG)

2472

2430

initlogger(debug, level)

2473

2431

2474

2432

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

2475

syslogger.setFormatter(

2476

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

2477

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

2478

server_settings["servicename"])))

2433

syslogger.setFormatter(logging.Formatter

2434

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

2435

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

2436

.format(server_settings

2437

["servicename"])))

2479

2438

2480

2439

# Parse config file with clients

2481

2440

client_config = configparser.SafeConfigParser(Client

2486

2445

global mandos_dbus_service

2487

2446

mandos_dbus_service = None

2488

2447

2489

socketfd = None

2490

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

2491

socketfd = server_settings["socket"]

2492

tcp_server = MandosServer(

2493

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

2494

ClientHandler,

2495

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

2496

use_ipv6=use_ipv6,

2497

gnutls_priority=server_settings["priority"],

2498

use_dbus=use_dbus,

2499

socketfd=socketfd)

2448

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

2449

server_settings["port"]),

2450

ClientHandler,

2451

interface=(server_settings["interface"]

2452

or None),

2453

use_ipv6=use_ipv6,

2454

gnutls_priority=

2455

server_settings["priority"],

2456

use_dbus=use_dbus,

2457

socketfd=(server_settings["socket"]

2458

or None))

2500

2459

if not foreground:

2501

2460

pidfilename = "/run/mandos.pid"

2502

2461

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

2503

2462

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

2504

2463

pidfile = None

2505

2464

try:

2506

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

2465

pidfile = open(pidfilename, "w")

2507

2466

except IOError as e:

2508

2467

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

2509

2468

exc_info=e)

2536

2495

def debug_gnutls(level, string):

2537

2496

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

2538

2497

2539

gnutls.library.functions.gnutls_global_set_log_function(

2540

debug_gnutls)

2498

(gnutls.library.functions

2499

.gnutls_global_set_log_function(debug_gnutls))

2541

2500

2542

2501

# Redirect stdin so all checkers get /dev/null

2543

2502

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

2563

2522

if use_dbus:

2564

2523

try:

2565

2524

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

2566

bus,

2567

do_not_queue=True)

2568

old_bus_name = dbus.service.BusName(

2569

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

2570

do_not_queue=True)

2571

except dbus.exceptions.DBusException as e:

2525

bus, do_not_queue=True)

2526

old_bus_name = (dbus.service.BusName

2527

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

2528

do_not_queue=True))

2529

except dbus.exceptions.NameExistsException as e:

2572

2530

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

2573

2531

use_dbus = False

2574

2532

server_settings["use_dbus"] = False

2575

2533

tcp_server.use_dbus = False

2576

if zeroconf:

2577

protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET

2578

service = AvahiServiceToSyslog(

2579

name = server_settings["servicename"],

2580

servicetype = "_mandos._tcp",

2581

protocol = protocol,

2582

bus = bus)

2583

if server_settings["interface"]:

2584

service.interface = if_nametoindex(

2585

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

2534

protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET

2535

service = AvahiServiceToSyslog(name =

2536

server_settings["servicename"],

2537

servicetype = "_mandos._tcp",

2538

protocol = protocol, bus = bus)

2539

if server_settings["interface"]:

2540

service.interface = (if_nametoindex

2541

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

2586

2542

2587

2543

global multiprocessing_manager

2588

2544

multiprocessing_manager = multiprocessing.Manager()

2607

2563

if server_settings["restore"]:

2608

2564

try:

2609

2565

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

2610

clients_data, old_client_settings = pickle.load(

2611

stored_state)

2566

clients_data, old_client_settings = (pickle.load

2567

(stored_state))

2612

2568

os.remove(stored_state_path)

2613

2569

except IOError as e:

2614

2570

if e.errno == errno.ENOENT:

2615

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

2616

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

2571

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

2572

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

2617

2573

else:

2618

2574

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

2619

2575

exc_info=e)

2620

2576

raise

2621

2577

except EOFError as e:

2622

2578

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

2623

"EOFError:",

2624

exc_info=e)

2579

"EOFError:", exc_info=e)

2625

2580

2626

2581

with PGPEngine() as pgp:

2627

for client_name, client in clients_data.items():

2582

for client_name, client in clients_data.iteritems():

2628

2583

# Skip removed clients

2629

2584

if client_name not in client_settings:

2630

2585

continue

2639

2594

# For each value in new config, check if it

2640

2595

# differs from the old config value (Except for

2641

2596

# the "secret" attribute)

2642

if (name != "secret"

2643

and (value !=

2644

old_client_settings[client_name][name])):

2597

if (name != "secret" and

2598

value != old_client_settings[client_name]

2599

[name]):

2645

2600

client[name] = value

2646

2601

except KeyError:

2647

2602

pass

2655

2610

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

2656

2611

if not client["last_checked_ok"]:

2657

2612

logger.warning(

2658

"disabling client {} - Client never "

2659

"performed a successful checker".format(

2660

client_name))

2613

"disabling client {0} - Client never "

2614

"performed a successful checker"

2615

.format(client_name))

2661

2616

client["enabled"] = False

2662

2617

elif client["last_checker_status"] != 0:

2663

2618

logger.warning(

2664

"disabling client {} - Client last"

2665

" checker failed with error code"

2666

" {}".format(

2667

client_name,

2668

client["last_checker_status"]))

2619

"disabling client {0} - Client "

2620

"last checker failed with error code {1}"

2621

.format(client_name,

2622

client["last_checker_status"]))

2669

2623

client["enabled"] = False

2670

2624

else:

2671

client["expires"] = (

2672

datetime.datetime.utcnow()

2673

+ client["timeout"])

2625

client["expires"] = (datetime.datetime

2626

.utcnow()

2627

+ client["timeout"])

2674

2628

logger.debug("Last checker succeeded,"

2675

" keeping {} enabled".format(

2676

client_name))

2629

" keeping {0} enabled"

2630

.format(client_name))

2677

2631

try:

2678

client["secret"] = pgp.decrypt(

2679

client["encrypted_secret"],

2680

client_settings[client_name]["secret"])

2632

client["secret"] = (

2633

pgp.decrypt(client["encrypted_secret"],

2634

client_settings[client_name]

2635

["secret"]))

2681

2636

except PGPError:

2682

2637

# If decryption fails, we use secret from new settings

2683

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

2684

client_name))

2685

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

2686

["secret"])

2638

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

2639

.format(client_name))

2640

client["secret"] = (

2641

client_settings[client_name]["secret"])

2687

2642

2688

2643

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

2689

2644

for client_name in (set(old_client_settings)

2694

2649

clients_data[client_name] = client_settings[client_name]

2695

2650

2696

2651

# Create all client objects

2697

for client_name, client in clients_data.items():

2652

for client_name, client in clients_data.iteritems():

2698

2653

tcp_server.clients[client_name] = client_class(

2699

name = client_name,

2700

settings = client,

2654

name = client_name, settings = client,

2701

2655

server_settings = server_settings)

2702

2656

2703

2657

if not tcp_server.clients:

2705

2659

2706

2660

if not foreground:

2707

2661

if pidfile is not None:

2708

pid = os.getpid()

2709

2662

try:

2710

2663

with pidfile:

2711

print(pid, file=pidfile)

2664

pid = os.getpid()

2665

pidfile.write(str(pid) + "\n".encode("utf-8"))

2712

2666

except IOError:

2713

2667

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

2714

2668

pidfilename, pid)

2719

2673

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

2720

2674

2721

2675

if use_dbus:

2722

2723

@alternate_dbus_interfaces(

2724

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

2676

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

2677

"se.bsnet.fukt.Mandos"})

2725

2678

class MandosDBusService(DBusObjectWithProperties):

2726

2679

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

2727

2728

2680

def __init__(self):

2729

2681

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

2730

2731

2682

_interface = "se.recompile.Mandos"

2732

2683

2733

2684

@dbus_interface_annotations(_interface)

2734

2685

def _foo(self):

2735

return {

2736

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

2737

"false" }

2686

return { "org.freedesktop.DBus.Property"

2687

".EmitsChangedSignal":

2688

"false"}

2738

2689

2739

2690

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

2740

2691

def ClientAdded(self, objpath):

2754

2705

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

2755

2706

def GetAllClients(self):

2756

2707

"D-Bus method"

2757

return dbus.Array(c.dbus_object_path for c in

2708

return dbus.Array(c.dbus_object_path

2709

for c in

2758

2710

tcp_server.clients.itervalues())

2759

2711

2760

2712

@dbus.service.method(_interface,

2762

2714

def GetAllClientsWithProperties(self):

2763

2715

"D-Bus method"

2764

2716

return dbus.Dictionary(

2765

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

2766

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

2717

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

2718

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

2767

2719

signature="oa{sv}")

2768

2720

2769

2721

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

2786

2738

2787

2739

def cleanup():

2788

2740

"Cleanup function; run on exit"

2789

if zeroconf:

2790

service.cleanup()

2741

service.cleanup()

2791

2742

2792

2743

multiprocessing.active_children()

2793

2744

wnull.close()

2807

2758

2808

2759

# A list of attributes that can not be pickled

2809

2760

# + secret.

2810

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

2811

"checker", "server_settings" }

2812

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

2813

.Object):

2761

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

2762

"checker", "server_settings"))

2763

for name, typ in (inspect.getmembers

2764

(dbus.service.Object)):

2814

2765

exclude.add(name)

2815

2766

2816

2767

client_dict["encrypted_secret"] = (client

2823

2774

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

2824

2775

2825

2776

try:

2826

with tempfile.NamedTemporaryFile(

2827

mode='wb',

2828

suffix=".pickle",

2829

prefix='clients-',

2830

dir=os.path.dirname(stored_state_path),

2831

delete=False) as stored_state:

2777

with (tempfile.NamedTemporaryFile

2778

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

2779

dir=os.path.dirname(stored_state_path),

2780

delete=False)) as stored_state:

2832

2781

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

2833

tempname = stored_state.name

2782

tempname=stored_state.name

2834

2783

os.rename(tempname, stored_state_path)

2835

2784

except (IOError, OSError) as e:

2836

2785

if not debug:

2839

2788

except NameError:

2840

2789

pass

2841

2790

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

2842

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

2791

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

2843

2792

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

2844

2793

else:

2845

2794

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

2855

2804

client.disable(quiet=True)

2856

2805

if use_dbus:

2857

2806

# Emit D-Bus signal

2858

mandos_dbus_service.ClientRemoved(

2859

client.dbus_object_path, client.name)

2807

mandos_dbus_service.ClientRemoved(client

2808

.dbus_object_path,

2809

client.name)

2860

2810

client_settings.clear()

2861

2811

2862

2812

atexit.register(cleanup)

2873

2823

tcp_server.server_activate()

2874

2824

2875

2825

# Find out what port we got

2876

if zeroconf:

2877

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

2826

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

2878

2827

if use_ipv6:

2879

2828

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

2880

2829

" flowinfo %d, scope_id %d",

2886

2835

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

2887

2836

2888

2837

try:

2889

if zeroconf:

2890

# From the Avahi example code

2891

try:

2892

service.activate()

2893

except dbus.exceptions.DBusException as error:

2894

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

2895

cleanup()

2896

sys.exit(1)

2897

# End of Avahi example code

2838

# From the Avahi example code

2839

try:

2840

service.activate()

2841

except dbus.exceptions.DBusException as error:

2842

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

2843

cleanup()

2844

sys.exit(1)

2845

# End of Avahi example code

2898

2846

2899

2847

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

2900

2848

lambda *args, **kwargs:

2915

2863

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

2916

2864

cleanup()

2917

2865

2918

2919

2866

if __name__ == '__main__':

2920

2867

main()