To get this branch, use:
bzr branch
http://bzr.recompile.se/loggerhead/mandos/trunk
« back to all changes in this revision
Viewing changes to mandos
- browse files at revision 659
- compare with another revision
- download diff
- download tarball
- view history from revision 659
- Committer: Teddy Hogeborn
- Date: 2014-03-01 09:39:25 UTC
- Revision ID: teddy@recompile.se-20140301093925-0x6nwf21f0zljk6e
* debian/copyright: Change year to "2014".
* mandos-ctl: - '' -
* mandos-monitor: - '' -
* plugins.d/mandos-client.xml: - '' -
* mandos-ctl: - '' -
* mandos-monitor: - '' -
* plugins.d/mandos-client.xml: - '' -
- files added:
- debian/mandos-client.examples
- network-hooks.d
- files modified:
- .bzrignore
added
removed
mandos
11
11
# "AvahiService" class, and some lines in "main".
12
12
#
13
13
# Everything else is
14
# Copyright © 2008-2011 Teddy Hogeborn
15
# Copyright © 2008-2011 Björn Påhlsson
14
# Copyright © 2008-2014 Teddy Hogeborn
15
# Copyright © 2008-2014 Björn Påhlsson
16
16
#
17
17
# This program is free software: you can redistribute it and/or modify
18
18
# it under the terms of the GNU General Public License as published by
34
34
from __future__ import (division, absolute_import, print_function,
35
35
unicode_literals)
36
36
37
from future_builtins import *
38
37
39
import SocketServer as socketserver
38
40
import socket
39
41
import argparse
63
65
import cPickle as pickle
64
66
import multiprocessing
65
67
import types
66
import hashlib
68
import binascii
69
import tempfile
70
import itertools
71
import collections
67
72
68
73
import dbus
69
74
import dbus.service
74
79
import ctypes.util
75
80
import xml.dom.minidom
76
81
import inspect
77
import Crypto.Cipher.AES
78
82
79
83
try:
80
84
SO_BINDTODEVICE = socket.SO_BINDTODEVICE
84
88
except ImportError:
85
89
SO_BINDTODEVICE = None
86
90
87
88
version = "1.4.1"
91
version = "1.6.4"
92
stored_state_file = "clients.pickle"
89
93
90
94
logger = logging.getLogger()
91
stored_state_path = "/var/lib/mandos/clients.pickle"
92
93
syslogger = (logging.handlers.SysLogHandler
94
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
95
address = str("/dev/log")))
96
syslogger.setFormatter(logging.Formatter
97
('Mandos [%(process)d]: %(levelname)s:'
98
' %(message)s'))
99
logger.addHandler(syslogger)
100
101
console = logging.StreamHandler()
102
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
103
' [%(process)d]:'
104
' %(levelname)s:'
105
' %(message)s'))
106
logger.addHandler(console)
95
syslogger = None
96
97
try:
98
if_nametoindex = (ctypes.cdll.LoadLibrary
99
(ctypes.util.find_library("c"))
100
.if_nametoindex)
101
except (OSError, AttributeError):
102
def if_nametoindex(interface):
103
"Get an interface index the hard way, i.e. using fcntl()"
104
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
105
with contextlib.closing(socket.socket()) as s:
106
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
107
struct.pack(str("16s16x"),
108
interface))
109
interface_index = struct.unpack(str("I"),
110
ifreq[16:20])[0]
111
return interface_index
112
113
114
def initlogger(debug, level=logging.WARNING):
115
"""init logger and add loglevel"""
116
117
syslogger = (logging.handlers.SysLogHandler
118
(facility =
119
logging.handlers.SysLogHandler.LOG_DAEMON,
120
address = str("/dev/log")))
121
syslogger.setFormatter(logging.Formatter
122
('Mandos [%(process)d]: %(levelname)s:'
123
' %(message)s'))
124
logger.addHandler(syslogger)
125
126
if debug:
127
console = logging.StreamHandler()
128
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
129
' [%(process)d]:'
130
' %(levelname)s:'
131
' %(message)s'))
132
logger.addHandler(console)
133
logger.setLevel(level)
134
135
136
class PGPError(Exception):
137
"""Exception if encryption/decryption fails"""
138
pass
139
140
141
class PGPEngine(object):
142
"""A simple class for OpenPGP symmetric encryption & decryption"""
143
def __init__(self):
144
self.tempdir = tempfile.mkdtemp(prefix="mandos-")
145
self.gnupgargs = ['--batch',
146
'--home', self.tempdir,
147
'--force-mdc',
148
'--quiet',
149
'--no-use-agent']
150
151
def __enter__(self):
152
return self
153
154
def __exit__(self, exc_type, exc_value, traceback):
155
self._cleanup()
156
return False
157
158
def __del__(self):
159
self._cleanup()
160
161
def _cleanup(self):
162
if self.tempdir is not None:
163
# Delete contents of tempdir
164
for root, dirs, files in os.walk(self.tempdir,
165
topdown = False):
166
for filename in files:
167
os.remove(os.path.join(root, filename))
168
for dirname in dirs:
169
os.rmdir(os.path.join(root, dirname))
170
# Remove tempdir
171
os.rmdir(self.tempdir)
172
self.tempdir = None
173
174
def password_encode(self, password):
175
# Passphrase can not be empty and can not contain newlines or
176
# NUL bytes. So we prefix it and hex encode it.
177
encoded = b"mandos" + binascii.hexlify(password)
178
if len(encoded) > 2048:
179
# GnuPG can't handle long passwords, so encode differently
180
encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
181
.replace(b"\n", b"\\n")
182
.replace(b"\0", b"\\x00"))
183
return encoded
184
185
def encrypt(self, data, password):
186
passphrase = self.password_encode(password)
187
with tempfile.NamedTemporaryFile(dir=self.tempdir
188
) as passfile:
189
passfile.write(passphrase)
190
passfile.flush()
191
proc = subprocess.Popen(['gpg', '--symmetric',
192
'--passphrase-file',
193
passfile.name]
194
+ self.gnupgargs,
195
stdin = subprocess.PIPE,
196
stdout = subprocess.PIPE,
197
stderr = subprocess.PIPE)
198
ciphertext, err = proc.communicate(input = data)
199
if proc.returncode != 0:
200
raise PGPError(err)
201
return ciphertext
202
203
def decrypt(self, data, password):
204
passphrase = self.password_encode(password)
205
with tempfile.NamedTemporaryFile(dir = self.tempdir
206
) as passfile:
207
passfile.write(passphrase)
208
passfile.flush()
209
proc = subprocess.Popen(['gpg', '--decrypt',
210
'--passphrase-file',
211
passfile.name]
212
+ self.gnupgargs,
213
stdin = subprocess.PIPE,
214
stdout = subprocess.PIPE,
215
stderr = subprocess.PIPE)
216
decrypted_plaintext, err = proc.communicate(input
217
= data)
218
if proc.returncode != 0:
219
raise PGPError(err)
220
return decrypted_plaintext
107
221
108
222
109
223
class AvahiError(Exception):
128
242
Used to optionally bind to the specified interface.
129
243
name: string; Example: 'Mandos'
130
244
type: string; Example: '_mandos._tcp'.
131
See <http://www.dns-sd.org/ServiceTypes.html>
245
See <https://www.iana.org/assignments/service-names-port-numbers>
132
246
port: integer; what port to announce
133
247
TXT: list of strings; TXT record for the service
134
248
domain: string; Domain to publish on, default to .local if empty.
140
254
server: D-Bus Server
141
255
bus: dbus.SystemBus()
142
256
"""
257
143
258
def __init__(self, interface = avahi.IF_UNSPEC, name = None,
144
259
servicetype = None, port = None, TXT = None,
145
260
domain = "", host = "", max_renames = 32768,
158
273
self.server = None
159
274
self.bus = bus
160
275
self.entry_group_state_changed_match = None
276
161
277
def rename(self):
162
278
"""Derived from the Avahi example code"""
163
279
if self.rename_count >= self.max_renames:
173
289
try:
174
290
self.add()
175
291
except dbus.exceptions.DBusException as error:
176
logger.critical("DBusException: %s", error)
292
logger.critical("D-Bus Exception", exc_info=error)
177
293
self.cleanup()
178
294
os._exit(1)
179
295
self.rename_count += 1
296
180
297
def remove(self):
181
298
"""Derived from the Avahi example code"""
182
299
if self.entry_group_state_changed_match is not None:
184
301
self.entry_group_state_changed_match = None
185
302
if self.group is not None:
186
303
self.group.Reset()
304
187
305
def add(self):
188
306
"""Derived from the Avahi example code"""
189
307
self.remove()
206
324
dbus.UInt16(self.port),
207
325
avahi.string_array_to_txt_array(self.TXT))
208
326
self.group.Commit()
327
209
328
def entry_group_state_changed(self, state, error):
210
329
"""Derived from the Avahi example code"""
211
330
logger.debug("Avahi entry group state change: %i", state)
218
337
elif state == avahi.ENTRY_GROUP_FAILURE:
219
338
logger.critical("Avahi: Error in group state changed %s",
220
339
unicode(error))
221
raise AvahiGroupError("State changed: %s"
222
% unicode(error))
340
raise AvahiGroupError("State changed: {0!s}"
341
.format(error))
342
223
343
def cleanup(self):
224
344
"""Derived from the Avahi example code"""
225
345
if self.group is not None:
226
346
try:
227
347
self.group.Free()
228
348
except (dbus.exceptions.UnknownMethodException,
229
dbus.exceptions.DBusException) as e:
349
dbus.exceptions.DBusException):
230
350
pass
231
351
self.group = None
232
352
self.remove()
353
233
354
def server_state_changed(self, state, error=None):
234
355
"""Derived from the Avahi example code"""
235
356
logger.debug("Avahi server state change: %i", state)
254
375
logger.debug("Unknown state: %r", state)
255
376
else:
256
377
logger.debug("Unknown state: %r: %r", state, error)
378
257
379
def activate(self):
258
380
"""Derived from the Avahi example code"""
259
381
if self.server is None:
266
388
self.server_state_changed)
267
389
self.server_state_changed(self.server.GetState())
268
390
391
269
392
class AvahiServiceToSyslog(AvahiService):
270
393
def rename(self):
271
394
"""Add the new name to the syslog messages"""
272
395
ret = AvahiService.rename(self)
273
396
syslogger.setFormatter(logging.Formatter
274
('Mandos (%s) [%%(process)d]:'
275
' %%(levelname)s: %%(message)s'
276
% self.name))
397
('Mandos ({0}) [%(process)d]:'
398
' %(levelname)s: %(message)s'
399
.format(self.name)))
277
400
return ret
278
401
279
def _timedelta_to_milliseconds(td):
402
403
def timedelta_to_milliseconds(td):
280
404
"Convert a datetime.timedelta() to milliseconds"
281
405
return ((td.days * 24 * 60 * 60 * 1000)
282
406
+ (td.seconds * 1000)
283
407
+ (td.microseconds // 1000))
284
408
409
285
410
class Client(object):
286
411
"""A representation of a client host served by this server.
287
412
288
413
Attributes:
289
_approved: bool(); 'None' if not yet approved/disapproved
414
approved: bool(); 'None' if not yet approved/disapproved
290
415
approval_delay: datetime.timedelta(); Time to wait for approval
291
416
approval_duration: datetime.timedelta(); Duration of one approval
292
417
checker: subprocess.Popen(); a running checker process used
311
436
last_approval_request: datetime.datetime(); (UTC) or None
312
437
last_checked_ok: datetime.datetime(); (UTC) or None
313
438
last_checker_status: integer between 0 and 255 reflecting exit
314
status of last checker. -1 reflect crashed
315
checker, or None.
316
last_enabled: datetime.datetime(); (UTC)
439
status of last checker. -1 reflects crashed
440
checker, -2 means no checker completed yet.
441
last_enabled: datetime.datetime(); (UTC) or None
317
442
name: string; from the config file, used in log messages and
318
443
D-Bus identifiers
319
444
secret: bytestring; sent verbatim (over TLS) to client
320
445
timeout: datetime.timedelta(); How long from last_checked_ok
321
446
until this client is disabled
322
extended_timeout: extra long timeout when password has been sent
447
extended_timeout: extra long timeout when secret has been sent
323
448
runtime_expansions: Allowed attributes for runtime expansion.
324
449
expires: datetime.datetime(); time (UTC) when a client will be
325
450
disabled, or None
451
server_settings: The server_settings dict from main()
326
452
"""
327
453
328
454
runtime_expansions = ("approval_delay", "approval_duration",
329
"created", "enabled", "fingerprint",
330
"host", "interval", "last_checked_ok",
455
"created", "enabled", "expires",
456
"fingerprint", "host", "interval",
457
"last_approval_request", "last_checked_ok",
331
458
"last_enabled", "name", "timeout")
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
}
332
469
333
470
def timeout_milliseconds(self):
334
471
"Return the 'timeout' attribute in milliseconds"
335
return _timedelta_to_milliseconds(self.timeout)
472
return timedelta_to_milliseconds(self.timeout)
336
473
337
474
def extended_timeout_milliseconds(self):
338
475
"Return the 'extended_timeout' attribute in milliseconds"
339
return _timedelta_to_milliseconds(self.extended_timeout)
476
return timedelta_to_milliseconds(self.extended_timeout)
340
477
341
478
def interval_milliseconds(self):
342
479
"Return the 'interval' attribute in milliseconds"
343
return _timedelta_to_milliseconds(self.interval)
480
return timedelta_to_milliseconds(self.interval)
344
481
345
482
def approval_delay_milliseconds(self):
346
return _timedelta_to_milliseconds(self.approval_delay)
347
348
def __init__(self, name = None, config=None):
349
"""Note: the 'checker' key in 'config' sets the
350
'checker_command' attribute and *not* the 'checker'
351
attribute."""
483
return timedelta_to_milliseconds(self.approval_delay)
484
485
@staticmethod
486
def config_parser(config):
487
"""Construct a new dict of client settings of this form:
488
{ client_name: {setting_name: value, ...}, ...}
489
with exceptions for any special settings as defined above.
490
NOTE: Must be a pure function. Must return the same result
491
value given the same arguments.
492
"""
493
settings = {}
494
for client_name in config.sections():
495
section = dict(config.items(client_name))
496
client = settings[client_name] = {}
497
498
client["host"] = section["host"]
499
# Reformat values from string types to Python types
500
client["approved_by_default"] = config.getboolean(
501
client_name, "approved_by_default")
502
client["enabled"] = config.getboolean(client_name,
503
"enabled")
504
505
client["fingerprint"] = (section["fingerprint"].upper()
506
.replace(" ", ""))
507
if "secret" in section:
508
client["secret"] = section["secret"].decode("base64")
509
elif "secfile" in section:
510
with open(os.path.expanduser(os.path.expandvars
511
(section["secfile"])),
512
"rb") as secfile:
513
client["secret"] = secfile.read()
514
else:
515
raise TypeError("No secret or secfile for section {0}"
516
.format(section))
517
client["timeout"] = string_to_delta(section["timeout"])
518
client["extended_timeout"] = string_to_delta(
519
section["extended_timeout"])
520
client["interval"] = string_to_delta(section["interval"])
521
client["approval_delay"] = string_to_delta(
522
section["approval_delay"])
523
client["approval_duration"] = string_to_delta(
524
section["approval_duration"])
525
client["checker_command"] = section["checker"]
526
client["last_approval_request"] = None
527
client["last_checked_ok"] = None
528
client["last_checker_status"] = -2
529
530
return settings
531
532
def __init__(self, settings, name = None, server_settings=None):
352
533
self.name = name
353
if config is None:
354
config = {}
534
if server_settings is None:
535
server_settings = {}
536
self.server_settings = server_settings
537
# adding all client settings
538
for setting, value in settings.iteritems():
539
setattr(self, setting, value)
540
541
if self.enabled:
542
if not hasattr(self, "last_enabled"):
543
self.last_enabled = datetime.datetime.utcnow()
544
if not hasattr(self, "expires"):
545
self.expires = (datetime.datetime.utcnow()
546
+ self.timeout)
547
else:
548
self.last_enabled = None
549
self.expires = None
550
355
551
logger.debug("Creating client %r", self.name)
356
552
# Uppercase and remove spaces from fingerprint for later
357
553
# comparison purposes with return value from the fingerprint()
358
554
# function
359
self.fingerprint = (config["fingerprint"].upper()
360
.replace(" ", ""))
361
555
logger.debug(" Fingerprint: %s", self.fingerprint)
362
if "secret" in config:
363
self.secret = config["secret"].decode("base64")
364
elif "secfile" in config:
365
with open(os.path.expanduser(os.path.expandvars
366
(config["secfile"])),
367
"rb") as secfile:
368
self.secret = secfile.read()
369
else:
370
raise TypeError("No secret or secfile for client %s"
371
% self.name)
372
self.host = config.get("host", "")
373
self.created = datetime.datetime.utcnow()
374
self.enabled = True
375
self.last_approval_request = None
376
self.last_enabled = datetime.datetime.utcnow()
377
self.last_checked_ok = None
378
self.last_checker_status = None
379
self.timeout = string_to_delta(config["timeout"])
380
self.extended_timeout = string_to_delta(config
381
["extended_timeout"])
382
self.interval = string_to_delta(config["interval"])
556
self.created = settings.get("created",
557
datetime.datetime.utcnow())
558
559
# attributes specific for this server instance
383
560
self.checker = None
384
561
self.checker_initiator_tag = None
385
562
self.disable_initiator_tag = None
386
self.expires = datetime.datetime.utcnow() + self.timeout
387
563
self.checker_callback_tag = None
388
self.checker_command = config["checker"]
389
564
self.current_checker_command = None
390
self._approved = None
391
self.approved_by_default = config.get("approved_by_default",
392
True)
565
self.approved = None
393
566
self.approvals_pending = 0
394
self.approval_delay = string_to_delta(
395
config["approval_delay"])
396
self.approval_duration = string_to_delta(
397
config["approval_duration"])
398
567
self.changedstate = (multiprocessing_manager
399
568
.Condition(multiprocessing_manager
400
569
.Lock()))
401
self.client_structure = [attr for attr
402
in self.__dict__.iterkeys()
570
self.client_structure = [attr for attr in
571
self.__dict__.iterkeys()
403
572
if not attr.startswith("_")]
404
573
self.client_structure.append("client_structure")
405
406
574
407
575
for name, t in inspect.getmembers(type(self),
408
576
lambda obj:
409
577
isinstance(obj,
421
589
if getattr(self, "enabled", False):
422
590
# Already enabled
423
591
return
424
self.send_changedstate()
425
592
self.expires = datetime.datetime.utcnow() + self.timeout
426
593
self.enabled = True
427
594
self.last_enabled = datetime.datetime.utcnow()
428
595
self.init_checker()
596
self.send_changedstate()
429
597
430
598
def disable(self, quiet=True):
431
599
"""Disable this client."""
432
600
if not getattr(self, "enabled", False):
433
601
return False
434
602
if not quiet:
435
self.send_changedstate()
436
if not quiet:
437
603
logger.info("Disabling client %s", self.name)
438
if getattr(self, "disable_initiator_tag", False):
604
if getattr(self, "disable_initiator_tag", None) is not None:
439
605
gobject.source_remove(self.disable_initiator_tag)
440
606
self.disable_initiator_tag = None
441
607
self.expires = None
442
if getattr(self, "checker_initiator_tag", False):
608
if getattr(self, "checker_initiator_tag", None) is not None:
443
609
gobject.source_remove(self.checker_initiator_tag)
444
610
self.checker_initiator_tag = None
445
611
self.stop_checker()
446
612
self.enabled = False
613
if not quiet:
614
self.send_changedstate()
447
615
# Do not run this again if called by a gobject.timeout_add
448
616
return False
449
617
450
618
def __del__(self):
451
619
self.disable()
452
620
453
621
def init_checker(self):
454
622
# Schedule a new checker to be started an 'interval' from now,
455
623
# and every interval from then on.
624
if self.checker_initiator_tag is not None:
625
gobject.source_remove(self.checker_initiator_tag)
456
626
self.checker_initiator_tag = (gobject.timeout_add
457
627
(self.interval_milliseconds(),
458
628
self.start_checker))
459
629
# Schedule a disable() when 'timeout' has passed
630
if self.disable_initiator_tag is not None:
631
gobject.source_remove(self.disable_initiator_tag)
460
632
self.disable_initiator_tag = (gobject.timeout_add
461
633
(self.timeout_milliseconds(),
462
634
self.disable))
463
635
# Also start a new checker *right now*.
464
636
self.start_checker()
465
466
637
467
638
def checker_callback(self, pid, condition, command):
468
639
"""The checker has completed, so take appropriate actions."""
469
640
self.checker_callback_tag = None
470
641
self.checker = None
471
642
if os.WIFEXITED(condition):
472
self.last_checker_status = os.WEXITSTATUS(condition)
643
self.last_checker_status = os.WEXITSTATUS(condition)
473
644
if self.last_checker_status == 0:
474
645
logger.info("Checker for %(name)s succeeded",
475
646
vars(self))
482
653
logger.warning("Checker for %(name)s crashed?",
483
654
vars(self))
484
655
485
def checked_ok(self, timeout=None):
486
"""Bump up the timeout for this client.
487
488
This should only be called when the client has been seen,
489
alive and well.
490
"""
656
def checked_ok(self):
657
"""Assert that the client has been seen, alive and well."""
658
self.last_checked_ok = datetime.datetime.utcnow()
659
self.last_checker_status = 0
660
self.bump_timeout()
661
662
def bump_timeout(self, timeout=None):
663
"""Bump up the timeout for this client."""
491
664
if timeout is None:
492
665
timeout = self.timeout
493
self.last_checked_ok = datetime.datetime.utcnow()
494
666
if self.disable_initiator_tag is not None:
495
667
gobject.source_remove(self.disable_initiator_tag)
668
self.disable_initiator_tag = None
496
669
if getattr(self, "enabled", False):
497
670
self.disable_initiator_tag = (gobject.timeout_add
498
(_timedelta_to_milliseconds
671
(timedelta_to_milliseconds
499
672
(timeout), self.disable))
500
673
self.expires = datetime.datetime.utcnow() + timeout
501
674
508
681
If a checker already exists, leave it running and do
509
682
nothing."""
510
683
# The reason for not killing a running checker is that if we
511
# did that, then if a checker (for some reason) started
512
# running slowly and taking more than 'interval' time, the
513
# client would inevitably timeout, since no checker would get
514
# a chance to run to completion. If we instead leave running
684
# did that, and if a checker (for some reason) started running
685
# slowly and taking more than 'interval' time, then the client
686
# would inevitably timeout, since no checker would get a
687
# chance to run to completion. If we instead leave running
515
688
# checkers alone, the checker would have to take more time
516
689
# than 'timeout' for the client to be disabled, which is as it
517
690
# should be.
519
692
# If a checker exists, make sure it is not a zombie
520
693
try:
521
694
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
522
except (AttributeError, OSError) as error:
523
if (isinstance(error, OSError)
524
and error.errno != errno.ECHILD):
525
raise error
695
except AttributeError:
696
pass
697
except OSError as error:
698
if error.errno != errno.ECHILD:
699
raise
526
700
else:
527
701
if pid:
528
702
logger.warning("Checker was a zombie")
531
705
self.current_checker_command)
532
706
# Start a new checker if needed
533
707
if self.checker is None:
708
# Escape attributes for the shell
709
escaped_attrs = dict(
710
(attr, re.escape(unicode(getattr(self, attr))))
711
for attr in
712
self.runtime_expansions)
534
713
try:
535
# In case checker_command has exactly one % operator
536
command = self.checker_command % self.host
537
except TypeError:
538
# Escape attributes for the shell
539
escaped_attrs = dict(
540
(attr,
541
re.escape(unicode(str(getattr(self, attr, "")),
542
errors=
543
'replace')))
544
for attr in
545
self.runtime_expansions)
546
547
try:
548
command = self.checker_command % escaped_attrs
549
except TypeError as error:
550
logger.error('Could not format string "%s":'
551
' %s', self.checker_command, error)
552
return True # Try again later
714
command = self.checker_command % escaped_attrs
715
except TypeError as error:
716
logger.error('Could not format string "%s"',
717
self.checker_command, exc_info=error)
718
return True # Try again later
553
719
self.current_checker_command = command
554
720
try:
555
721
logger.info("Starting checker %r for %s",
558
724
# in normal mode, that is already done by daemon(),
559
725
# and in debug mode we don't want to. (Stdin is
560
726
# always replaced by /dev/null.)
727
# The exception is when not debugging but nevertheless
728
# running in the foreground; use the previously
729
# created wnull.
730
popen_args = {}
731
if (not self.server_settings["debug"]
732
and self.server_settings["foreground"]):
733
popen_args.update({"stdout": wnull,
734
"stderr": wnull })
561
735
self.checker = subprocess.Popen(command,
562
736
close_fds=True,
563
shell=True, cwd="/")
564
self.checker_callback_tag = (gobject.child_watch_add
565
(self.checker.pid,
566
self.checker_callback,
567
data=command))
568
# The checker may have completed before the gobject
569
# watch was added. Check for this.
737
shell=True, cwd="/",
738
**popen_args)
739
except OSError as error:
740
logger.error("Failed to start subprocess",
741
exc_info=error)
742
return True
743
self.checker_callback_tag = (gobject.child_watch_add
744
(self.checker.pid,
745
self.checker_callback,
746
data=command))
747
# The checker may have completed before the gobject
748
# watch was added. Check for this.
749
try:
570
750
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
571
if pid:
572
gobject.source_remove(self.checker_callback_tag)
573
self.checker_callback(pid, status, command)
574
751
except OSError as error:
575
logger.error("Failed to start subprocess: %s",
576
error)
752
if error.errno == errno.ECHILD:
753
# This should never happen
754
logger.error("Child process vanished",
755
exc_info=error)
756
return True
757
raise
758
if pid:
759
gobject.source_remove(self.checker_callback_tag)
760
self.checker_callback(pid, status, command)
577
761
# Re-run this periodically if run by gobject.timeout_add
578
762
return True
579
763
586
770
return
587
771
logger.debug("Stopping checker for %(name)s", vars(self))
588
772
try:
589
os.kill(self.checker.pid, signal.SIGTERM)
773
self.checker.terminate()
590
774
#time.sleep(0.5)
591
775
#if self.checker.poll() is None:
592
# os.kill(self.checker.pid, signal.SIGKILL)
776
# self.checker.kill()
593
777
except OSError as error:
594
778
if error.errno != errno.ESRCH: # No such process
595
779
raise
596
780
self.checker = None
597
781
598
# Encrypts a client secret and stores it in a varible
599
# encrypted_secret
600
def encrypt_secret(self, key):
601
# Encryption-key need to be of a specific size, so we hash
602
# supplied key
603
hasheng = hashlib.sha256()
604
hasheng.update(key)
605
encryptionkey = hasheng.digest()
606
607
# Create validation hash so we know at decryption if it was
608
# sucessful
609
hasheng = hashlib.sha256()
610
hasheng.update(self.secret)
611
validationhash = hasheng.digest()
612
613
# Encrypt secret
614
iv = os.urandom(Crypto.Cipher.AES.block_size)
615
ciphereng = Crypto.Cipher.AES.new(encryptionkey,
616
Crypto.Cipher.AES.MODE_CFB, iv)
617
ciphertext = ciphereng.encrypt(validationhash+self.secret)
618
self.encrypted_secret = (ciphertext, iv)
619
620
# Decrypt a encrypted client secret
621
def decrypt_secret(self, key):
622
# Decryption-key need to be of a specific size, so we hash
623
# supplied key
624
hasheng = hashlib.sha256()
625
hasheng.update(key)
626
encryptionkey = hasheng.digest()
627
628
# Decrypt encrypted secret
629
ciphertext, iv = self.encrypted_secret
630
ciphereng = Crypto.Cipher.AES.new(encryptionkey,
631
Crypto.Cipher.AES.MODE_CFB, iv)
632
plain = ciphereng.decrypt(ciphertext)
633
634
# Validate decrypted secret to know if it was succesful
635
hasheng = hashlib.sha256()
636
validationhash = plain[:hasheng.digest_size]
637
secret = plain[hasheng.digest_size:]
638
hasheng.update(secret)
639
640
# If validation fails, we use key as new secret. Otherwise, we
641
# use the decrypted secret
642
if hasheng.digest() == validationhash:
643
self.secret = secret
644
else:
645
self.secret = key
646
del self.encrypted_secret
647
648
782
649
783
def dbus_service_property(dbus_interface, signature="v",
650
784
access="readwrite", byte_arrays=False):
662
796
# "Set" method, so we fail early here:
663
797
if byte_arrays and signature != "ay":
664
798
raise ValueError("Byte arrays not supported for non-'ay'"
665
" signature %r" % signature)
799
" signature {0!r}".format(signature))
666
800
def decorator(func):
667
801
func._dbus_is_property = True
668
802
func._dbus_interface = dbus_interface
676
810
return decorator
677
811
678
812
813
def dbus_interface_annotations(dbus_interface):
814
"""Decorator for marking functions returning interface annotations
815
816
Usage:
817
818
@dbus_interface_annotations("org.example.Interface")
819
def _foo(self): # Function name does not matter
820
return {"org.freedesktop.DBus.Deprecated": "true",
821
"org.freedesktop.DBus.Property.EmitsChangedSignal":
822
"false"}
823
"""
824
def decorator(func):
825
func._dbus_is_interface = True
826
func._dbus_interface = dbus_interface
827
func._dbus_name = dbus_interface
828
return func
829
return decorator
830
831
832
def dbus_annotations(annotations):
833
"""Decorator to annotate D-Bus methods, signals or properties
834
Usage:
835
836
@dbus_service_property("org.example.Interface", signature="b",
837
access="r")
838
@dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
839
"org.freedesktop.DBus.Property."
840
"EmitsChangedSignal": "false"})
841
def Property_dbus_property(self):
842
return dbus.Boolean(False)
843
"""
844
def decorator(func):
845
func._dbus_annotations = annotations
846
return func
847
return decorator
848
849
679
850
class DBusPropertyException(dbus.exceptions.DBusException):
680
851
"""A base class for D-Bus property-related exceptions
681
852
"""
704
875
"""
705
876
706
877
@staticmethod
707
def _is_dbus_property(obj):
708
return getattr(obj, "_dbus_is_property", False)
878
def _is_dbus_thing(thing):
879
"""Returns a function testing if an attribute is a D-Bus thing
880
881
If called like _is_dbus_thing("method") it returns a function
882
suitable for use as predicate to inspect.getmembers().
883
"""
884
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
885
False)
709
886
710
def _get_all_dbus_properties(self):
887
def _get_all_dbus_things(self, thing):
711
888
"""Returns a generator of (name, attribute) pairs
712
889
"""
713
return ((prop.__get__(self)._dbus_name, prop.__get__(self))
890
return ((getattr(athing.__get__(self), "_dbus_name",
891
name),
892
athing.__get__(self))
714
893
for cls in self.__class__.__mro__
715
for name, prop in
716
inspect.getmembers(cls, self._is_dbus_property))
894
for name, athing in
895
inspect.getmembers(cls,
896
self._is_dbus_thing(thing)))
717
897
718
898
def _get_dbus_property(self, interface_name, property_name):
719
899
"""Returns a bound method if one exists which is a D-Bus
721
901
"""
722
902
for cls in self.__class__.__mro__:
723
903
for name, value in (inspect.getmembers
724
(cls, self._is_dbus_property)):
904
(cls,
905
self._is_dbus_thing("property"))):
725
906
if (value._dbus_name == property_name
726
907
and value._dbus_interface == interface_name):
727
908
return value.__get__(self)
755
936
# The byte_arrays option is not supported yet on
756
937
# signatures other than "ay".
757
938
if prop._dbus_signature != "ay":
758
raise ValueError
759
value = dbus.ByteArray(''.join(unichr(byte)
760
for byte in value))
939
raise ValueError("Byte arrays not supported for non-"
940
"'ay' signature {0!r}"
941
.format(prop._dbus_signature))
942
value = dbus.ByteArray(b''.join(chr(byte)
943
for byte in value))
761
944
prop(value)
762
945
763
946
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
768
951
769
952
Note: Will not include properties with access="write".
770
953
"""
771
all = {}
772
for name, prop in self._get_all_dbus_properties():
954
properties = {}
955
for name, prop in self._get_all_dbus_things("property"):
773
956
if (interface_name
774
957
and interface_name != prop._dbus_interface):
775
958
# Interface non-empty but did not match
779
962
continue
780
963
value = prop()
781
964
if not hasattr(value, "variant_level"):
782
all[name] = value
965
properties[name] = value
783
966
continue
784
all[name] = type(value)(value, variant_level=
785
value.variant_level+1)
786
return dbus.Dictionary(all, signature="sv")
967
properties[name] = type(value)(value, variant_level=
968
value.variant_level+1)
969
return dbus.Dictionary(properties, signature="sv")
787
970
788
971
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
789
972
out_signature="s",
790
973
path_keyword='object_path',
791
974
connection_keyword='connection')
792
975
def Introspect(self, object_path, connection):
793
"""Standard D-Bus method, overloaded to insert property tags.
976
"""Overloading of standard D-Bus method.
977
978
Inserts property tags and interface annotation tags.
794
979
"""
795
980
xmlstring = dbus.service.Object.Introspect(self, object_path,
796
981
connection)
803
988
e.setAttribute("access", prop._dbus_access)
804
989
return e
805
990
for if_tag in document.getElementsByTagName("interface"):
991
# Add property tags
806
992
for tag in (make_tag(document, name, prop)
807
993
for name, prop
808
in self._get_all_dbus_properties()
994
in self._get_all_dbus_things("property")
809
995
if prop._dbus_interface
810
996
== if_tag.getAttribute("name")):
811
997
if_tag.appendChild(tag)
998
# Add annotation tags
999
for typ in ("method", "signal", "property"):
1000
for tag in if_tag.getElementsByTagName(typ):
1001
annots = dict()
1002
for name, prop in (self.
1003
_get_all_dbus_things(typ)):
1004
if (name == tag.getAttribute("name")
1005
and prop._dbus_interface
1006
== if_tag.getAttribute("name")):
1007
annots.update(getattr
1008
(prop,
1009
"_dbus_annotations",
1010
{}))
1011
for name, value in annots.iteritems():
1012
ann_tag = document.createElement(
1013
"annotation")
1014
ann_tag.setAttribute("name", name)
1015
ann_tag.setAttribute("value", value)
1016
tag.appendChild(ann_tag)
1017
# Add interface annotation tags
1018
for annotation, value in dict(
1019
itertools.chain.from_iterable(
1020
annotations().iteritems()
1021
for name, annotations in
1022
self._get_all_dbus_things("interface")
1023
if name == if_tag.getAttribute("name")
1024
)).iteritems():
1025
ann_tag = document.createElement("annotation")
1026
ann_tag.setAttribute("name", annotation)
1027
ann_tag.setAttribute("value", value)
1028
if_tag.appendChild(ann_tag)
812
1029
# Add the names to the return values for the
813
1030
# "org.freedesktop.DBus.Properties" methods
814
1031
if (if_tag.getAttribute("name")
829
1046
except (AttributeError, xml.dom.DOMException,
830
1047
xml.parsers.expat.ExpatError) as error:
831
1048
logger.error("Failed to override Introspection method",
832
error)
1049
exc_info=error)
833
1050
return xmlstring
834
1051
835
1052
836
def datetime_to_dbus (dt, variant_level=0):
1053
def datetime_to_dbus(dt, variant_level=0):
837
1054
"""Convert a UTC datetime.datetime() to a D-Bus type."""
838
1055
if dt is None:
839
1056
return dbus.String("", variant_level = variant_level)
840
1057
return dbus.String(dt.isoformat(),
841
1058
variant_level=variant_level)
842
1059
843
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
844
.__metaclass__):
845
"""Applied to an empty subclass of a D-Bus object, this metaclass
846
will add additional D-Bus attributes matching a certain pattern.
1060
1061
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1062
"""A class decorator; applied to a subclass of
1063
dbus.service.Object, it will add alternate D-Bus attributes with
1064
interface names according to the "alt_interface_names" mapping.
1065
Usage:
1066
1067
@alternate_dbus_interfaces({"org.example.Interface":
1068
"net.example.AlternateInterface"})
1069
class SampleDBusObject(dbus.service.Object):
1070
@dbus.service.method("org.example.Interface")
1071
def SampleDBusMethod():
1072
pass
1073
1074
The above "SampleDBusMethod" on "SampleDBusObject" will be
1075
reachable via two interfaces: "org.example.Interface" and
1076
"net.example.AlternateInterface", the latter of which will have
1077
its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
1078
"true", unless "deprecate" is passed with a False value.
1079
1080
This works for methods and signals, and also for D-Bus properties
1081
(from DBusObjectWithProperties) and interfaces (from the
1082
dbus_interface_annotations decorator).
847
1083
"""
848
def __new__(mcs, name, bases, attr):
849
# Go through all the base classes which could have D-Bus
850
# methods, signals, or properties in them
851
for base in (b for b in bases
852
if issubclass(b, dbus.service.Object)):
853
# Go though all attributes of the base class
854
for attrname, attribute in inspect.getmembers(base):
1084
def wrapper(cls):
1085
for orig_interface_name, alt_interface_name in (
1086
alt_interface_names.iteritems()):
1087
attr = {}
1088
interface_names = set()
1089
# Go though all attributes of the class
1090
for attrname, attribute in inspect.getmembers(cls):
855
1091
# Ignore non-D-Bus attributes, and D-Bus attributes
856
1092
# with the wrong interface name
857
1093
if (not hasattr(attribute, "_dbus_interface")
858
1094
or not attribute._dbus_interface
859
.startswith("se.recompile.Mandos")):
1095
.startswith(orig_interface_name)):
860
1096
continue
861
1097
# Create an alternate D-Bus interface name based on
862
1098
# the current name
863
1099
alt_interface = (attribute._dbus_interface
864
.replace("se.recompile.Mandos",
865
"se.bsnet.fukt.Mandos"))
1100
.replace(orig_interface_name,
1101
alt_interface_name))
1102
interface_names.add(alt_interface)
866
1103
# Is this a D-Bus signal?
867
1104
if getattr(attribute, "_dbus_is_signal", False):
868
# Extract the original non-method function by
869
# black magic
1105
# Extract the original non-method undecorated
1106
# function by black magic
870
1107
nonmethod_func = (dict(
871
1108
zip(attribute.func_code.co_freevars,
872
1109
attribute.__closure__))["func"]
883
1120
nonmethod_func.func_name,
884
1121
nonmethod_func.func_defaults,
885
1122
nonmethod_func.func_closure)))
1123
# Copy annotations, if any
1124
try:
1125
new_function._dbus_annotations = (
1126
dict(attribute._dbus_annotations))
1127
except AttributeError:
1128
pass
886
1129
# Define a creator of a function to call both the
887
# old and new functions, so both the old and new
888
# signals gets sent when the function is called
1130
# original and alternate functions, so both the
1131
# original and alternate signals gets sent when
1132
# the function is called
889
1133
def fixscope(func1, func2):
890
1134
"""This function is a scope container to pass
891
1135
func1 and func2 to the "call_both" function
898
1142
return call_both
899
1143
# Create the "call_both" function and add it to
900
1144
# the class
901
attr[attrname] = fixscope(attribute,
902
new_function)
1145
attr[attrname] = fixscope(attribute, new_function)
903
1146
# Is this a D-Bus method?
904
1147
elif getattr(attribute, "_dbus_is_method", False):
905
1148
# Create a new, but exactly alike, function
916
1159
attribute.func_name,
917
1160
attribute.func_defaults,
918
1161
attribute.func_closure)))
1162
# Copy annotations, if any
1163
try:
1164
attr[attrname]._dbus_annotations = (
1165
dict(attribute._dbus_annotations))
1166
except AttributeError:
1167
pass
919
1168
# Is this a D-Bus property?
920
1169
elif getattr(attribute, "_dbus_is_property", False):
921
1170
# Create a new, but exactly alike, function
935
1184
attribute.func_name,
936
1185
attribute.func_defaults,
937
1186
attribute.func_closure)))
938
return type.__new__(mcs, name, bases, attr)
939
1187
# Copy annotations, if any
1188
try:
1189
attr[attrname]._dbus_annotations = (
1190
dict(attribute._dbus_annotations))
1191
except AttributeError:
1192
pass
1193
# Is this a D-Bus interface?
1194
elif getattr(attribute, "_dbus_is_interface", False):
1195
# Create a new, but exactly alike, function
1196
# object. Decorate it to be a new D-Bus interface
1197
# with the alternate D-Bus interface name. Add it
1198
# to the class.
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)))
1207
if deprecate:
1208
# Deprecate all alternate interfaces
1209
iname="_AlternateDBusNames_interface_annotation{0}"
1210
for interface_name in interface_names:
1211
@dbus_interface_annotations(interface_name)
1212
def func(self):
1213
return { "org.freedesktop.DBus.Deprecated":
1214
"true" }
1215
# Find an unused name
1216
for aname in (iname.format(i)
1217
for i in itertools.count()):
1218
if aname not in attr:
1219
attr[aname] = func
1220
break
1221
if interface_names:
1222
# Replace the class with a new subclass of it with
1223
# methods, signals, etc. as created above.
1224
cls = type(b"{0}Alternate".format(cls.__name__),
1225
(cls,), attr)
1226
return cls
1227
return wrapper
1228
1229
1230
@alternate_dbus_interfaces({"se.recompile.Mandos":
1231
"se.bsnet.fukt.Mandos"})
940
1232
class ClientDBus(Client, DBusObjectWithProperties):
941
1233
"""A Client class using D-Bus
942
1234
952
1244
953
1245
def __init__(self, bus = None, *args, **kwargs):
954
1246
self.bus = bus
955
self._approvals_pending = 0
956
1247
Client.__init__(self, *args, **kwargs)
957
self.add_to_dbus()
958
959
def add_to_dbus(self):
960
1248
# Only now, when this client is initialized, can it show up on
961
1249
# the D-Bus
962
1250
client_object_name = unicode(self.name).translate(
966
1254
("/clients/" + client_object_name))
967
1255
DBusObjectWithProperties.__init__(self, self.bus,
968
1256
self.dbus_object_path)
969
1257
970
1258
def notifychangeproperty(transform_func,
971
1259
dbus_name, type_func=lambda x: x,
972
1260
variant_level=1):
973
1261
""" Modify a variable so that it's a property which announces
974
1262
its changes to DBus.
975
1263
976
1264
transform_fun: Function that takes a value and a variant_level
977
1265
and transforms it to a D-Bus type.
978
1266
dbus_name: D-Bus name of the variable
995
1283
996
1284
return property(lambda self: getattr(self, attrname), setter)
997
1285
998
999
1286
expires = notifychangeproperty(datetime_to_dbus, "Expires")
1000
1287
approvals_pending = notifychangeproperty(dbus.Boolean,
1001
1288
"ApprovalPending",
1008
1295
checker is not None)
1009
1296
last_checked_ok = notifychangeproperty(datetime_to_dbus,
1010
1297
"LastCheckedOK")
1298
last_checker_status = notifychangeproperty(dbus.Int16,
1299
"LastCheckerStatus")
1011
1300
last_approval_request = notifychangeproperty(
1012
1301
datetime_to_dbus, "LastApprovalRequest")
1013
1302
approved_by_default = notifychangeproperty(dbus.Boolean,
1014
1303
"ApprovedByDefault")
1015
approval_delay = notifychangeproperty(dbus.UInt16,
1304
approval_delay = notifychangeproperty(dbus.UInt64,
1016
1305
"ApprovalDelay",
1017
1306
type_func =
1018
_timedelta_to_milliseconds)
1307
timedelta_to_milliseconds)
1019
1308
approval_duration = notifychangeproperty(
1020
dbus.UInt16, "ApprovalDuration",
1021
type_func = _timedelta_to_milliseconds)
1309
dbus.UInt64, "ApprovalDuration",
1310
type_func = timedelta_to_milliseconds)
1022
1311
host = notifychangeproperty(dbus.String, "Host")
1023
timeout = notifychangeproperty(dbus.UInt16, "Timeout",
1312
timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1024
1313
type_func =
1025
_timedelta_to_milliseconds)
1314
timedelta_to_milliseconds)
1026
1315
extended_timeout = notifychangeproperty(
1027
dbus.UInt16, "ExtendedTimeout",
1028
type_func = _timedelta_to_milliseconds)
1029
interval = notifychangeproperty(dbus.UInt16,
1316
dbus.UInt64, "ExtendedTimeout",
1317
type_func = timedelta_to_milliseconds)
1318
interval = notifychangeproperty(dbus.UInt64,
1030
1319
"Interval",
1031
1320
type_func =
1032
_timedelta_to_milliseconds)
1321
timedelta_to_milliseconds)
1033
1322
checker_command = notifychangeproperty(dbus.String, "Checker")
1034
1323
1035
1324
del notifychangeproperty
1063
1352
*args, **kwargs)
1064
1353
1065
1354
def start_checker(self, *args, **kwargs):
1066
old_checker = self.checker
1067
if self.checker is not None:
1068
old_checker_pid = self.checker.pid
1069
else:
1070
old_checker_pid = None
1355
old_checker_pid = getattr(self.checker, "pid", None)
1071
1356
r = Client.start_checker(self, *args, **kwargs)
1072
1357
# Only if new checker process was started
1073
1358
if (self.checker is not None
1077
1362
return r
1078
1363
1079
1364
def _reset_approved(self):
1080
self._approved = None
1365
self.approved = None
1081
1366
return False
1082
1367
1083
1368
def approve(self, value=True):
1084
self.send_changedstate()
1085
self._approved = value
1086
gobject.timeout_add(_timedelta_to_milliseconds
1369
self.approved = value
1370
gobject.timeout_add(timedelta_to_milliseconds
1087
1371
(self.approval_duration),
1088
1372
self._reset_approved)
1089
1373
self.send_changedstate()
1090
1374
1091
1375
## D-Bus methods, signals & properties
1092
1376
_interface = "se.recompile.Mandos.Client"
1093
1377
1378
## Interfaces
1379
1380
@dbus_interface_annotations(_interface)
1381
def _foo(self):
1382
return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
1383
"false"}
1384
1094
1385
## Signals
1095
1386
1096
1387
# CheckerCompleted - signal
1195
1486
access="readwrite")
1196
1487
def ApprovalDuration_dbus_property(self, value=None):
1197
1488
if value is None: # get
1198
return dbus.UInt64(_timedelta_to_milliseconds(
1489
return dbus.UInt64(timedelta_to_milliseconds(
1199
1490
self.approval_duration))
1200
1491
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1201
1492
1215
1506
def Host_dbus_property(self, value=None):
1216
1507
if value is None: # get
1217
1508
return dbus.String(self.host)
1218
self.host = value
1509
self.host = unicode(value)
1219
1510
1220
1511
# Created - property
1221
1512
@dbus_service_property(_interface, signature="s", access="read")
1222
1513
def Created_dbus_property(self):
1223
return dbus.String(datetime_to_dbus(self.created))
1514
return datetime_to_dbus(self.created)
1224
1515
1225
1516
# LastEnabled - property
1226
1517
@dbus_service_property(_interface, signature="s", access="read")
1247
1538
return
1248
1539
return datetime_to_dbus(self.last_checked_ok)
1249
1540
1541
# LastCheckerStatus - property
1542
@dbus_service_property(_interface, signature="n",
1543
access="read")
1544
def LastCheckerStatus_dbus_property(self):
1545
return dbus.Int16(self.last_checker_status)
1546
1250
1547
# Expires - property
1251
1548
@dbus_service_property(_interface, signature="s", access="read")
1252
1549
def Expires_dbus_property(self):
1263
1560
def Timeout_dbus_property(self, value=None):
1264
1561
if value is None: # get
1265
1562
return dbus.UInt64(self.timeout_milliseconds())
1563
old_timeout = self.timeout
1266
1564
self.timeout = datetime.timedelta(0, 0, 0, value)
1267
if getattr(self, "disable_initiator_tag", None) is None:
1268
return
1269
# Reschedule timeout
1270
gobject.source_remove(self.disable_initiator_tag)
1271
self.disable_initiator_tag = None
1272
self.expires = None
1273
time_to_die = _timedelta_to_milliseconds((self
1274
.last_checked_ok
1275
+ self.timeout)
1276
- datetime.datetime
1277
.utcnow())
1278
if time_to_die <= 0:
1279
# The timeout has passed
1280
self.disable()
1281
else:
1282
self.expires = (datetime.datetime.utcnow()
1283
+ datetime.timedelta(milliseconds =
1284
time_to_die))
1285
self.disable_initiator_tag = (gobject.timeout_add
1286
(time_to_die, self.disable))
1565
# Reschedule disabling
1566
if self.enabled:
1567
now = datetime.datetime.utcnow()
1568
self.expires += self.timeout - old_timeout
1569
if self.expires <= now:
1570
# The timeout has passed
1571
self.disable()
1572
else:
1573
if (getattr(self, "disable_initiator_tag", None)
1574
is None):
1575
return
1576
gobject.source_remove(self.disable_initiator_tag)
1577
self.disable_initiator_tag = (
1578
gobject.timeout_add(
1579
timedelta_to_milliseconds(self.expires - now),
1580
self.disable))
1287
1581
1288
1582
# ExtendedTimeout - property
1289
1583
@dbus_service_property(_interface, signature="t",
1302
1596
self.interval = datetime.timedelta(0, 0, 0, value)
1303
1597
if getattr(self, "checker_initiator_tag", None) is None:
1304
1598
return
1305
# Reschedule checker run
1306
gobject.source_remove(self.checker_initiator_tag)
1307
self.checker_initiator_tag = (gobject.timeout_add
1308
(value, self.start_checker))
1309
self.start_checker() # Start one now, too
1599
if self.enabled:
1600
# Reschedule checker run
1601
gobject.source_remove(self.checker_initiator_tag)
1602
self.checker_initiator_tag = (gobject.timeout_add
1603
(value, self.start_checker))
1604
self.start_checker() # Start one now, too
1310
1605
1311
1606
# Checker - property
1312
1607
@dbus_service_property(_interface, signature="s",
1314
1609
def Checker_dbus_property(self, value=None):
1315
1610
if value is None: # get
1316
1611
return dbus.String(self.checker_command)
1317
self.checker_command = value
1612
self.checker_command = unicode(value)
1318
1613
1319
1614
# CheckerRunning - property
1320
1615
@dbus_service_property(_interface, signature="b",
1349
1644
raise KeyError()
1350
1645
1351
1646
def __getattribute__(self, name):
1352
if(name == '_pipe'):
1647
if name == '_pipe':
1353
1648
return super(ProxyClient, self).__getattribute__(name)
1354
1649
self._pipe.send(('getattr', name))
1355
1650
data = self._pipe.recv()
1362
1657
return func
1363
1658
1364
1659
def __setattr__(self, name, value):
1365
if(name == '_pipe'):
1660
if name == '_pipe':
1366
1661
return super(ProxyClient, self).__setattr__(name, value)
1367
1662
self._pipe.send(('setattr', name, value))
1368
1663
1369
class ClientDBusTransitional(ClientDBus):
1370
__metaclass__ = AlternateDBusNamesMetaclass
1371
1664
1372
1665
class ClientHandler(socketserver.BaseRequestHandler, object):
1373
1666
"""A class to handle client connections.
1410
1703
logger.debug("Protocol version: %r", line)
1411
1704
try:
1412
1705
if int(line.strip().split()[0]) > 1:
1413
raise RuntimeError
1706
raise RuntimeError(line)
1414
1707
except (ValueError, IndexError, RuntimeError) as error:
1415
1708
logger.error("Unknown protocol version: %s", error)
1416
1709
return
1456
1749
client.Rejected("Disabled")
1457
1750
return
1458
1751
1459
if client._approved or not client.approval_delay:
1752
if client.approved or not client.approval_delay:
1460
1753
#We are approved or approval is disabled
1461
1754
break
1462
elif client._approved is None:
1755
elif client.approved is None:
1463
1756
logger.info("Client %s needs approval",
1464
1757
client.name)
1465
1758
if self.server.use_dbus:
1478
1771
#wait until timeout or approved
1479
1772
time = datetime.datetime.now()
1480
1773
client.changedstate.acquire()
1481
(client.changedstate.wait
1482
(float(client._timedelta_to_milliseconds(delay)
1483
/ 1000)))
1774
client.changedstate.wait(
1775
float(timedelta_to_milliseconds(delay)
1776
/ 1000))
1484
1777
client.changedstate.release()
1485
1778
time2 = datetime.datetime.now()
1486
1779
if (time2 - time) >= delay:
1502
1795
try:
1503
1796
sent = session.send(client.secret[sent_size:])
1504
1797
except gnutls.errors.GNUTLSError as error:
1505
logger.warning("gnutls send failed")
1798
logger.warning("gnutls send failed",
1799
exc_info=error)
1506
1800
return
1507
1801
logger.debug("Sent: %d, remaining: %d",
1508
1802
sent, len(client.secret)
1511
1805
1512
1806
logger.info("Sending secret to %s", client.name)
1513
1807
# bump the timeout using extended_timeout
1514
client.checked_ok(client.extended_timeout)
1808
client.bump_timeout(client.extended_timeout)
1515
1809
if self.server.use_dbus:
1516
1810
# Emit D-Bus signal
1517
1811
client.GotSecret()
1522
1816
try:
1523
1817
session.bye()
1524
1818
except gnutls.errors.GNUTLSError as error:
1525
logger.warning("GnuTLS bye failed")
1819
logger.warning("GnuTLS bye failed",
1820
exc_info=error)
1526
1821
1527
1822
@staticmethod
1528
1823
def peer_certificate(session):
1584
1879
# Convert the buffer to a Python bytestring
1585
1880
fpr = ctypes.string_at(buf, buf_len.value)
1586
1881
# Convert the bytestring to hexadecimal notation
1587
hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
1882
hex_fpr = binascii.hexlify(fpr).upper()
1588
1883
return hex_fpr
1589
1884
1590
1885
1593
1888
def sub_process_main(self, request, address):
1594
1889
try:
1595
1890
self.finish_request(request, address)
1596
except:
1891
except Exception:
1597
1892
self.handle_error(request, address)
1598
1893
self.close_request(request)
1599
1894
1600
1895
def process_request(self, request, address):
1601
1896
"""Start a new process to process the request."""
1602
1897
proc = multiprocessing.Process(target = self.sub_process_main,
1603
args = (request,
1604
address))
1898
args = (request, address))
1605
1899
proc.start()
1606
1900
return proc
1607
1901
1622
1916
1623
1917
def add_pipe(self, parent_pipe, proc):
1624
1918
"""Dummy function; override as necessary"""
1625
raise NotImplementedError
1919
raise NotImplementedError()
1626
1920
1627
1921
1628
1922
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1635
1929
use_ipv6: Boolean; to use IPv6 or not
1636
1930
"""
1637
1931
def __init__(self, server_address, RequestHandlerClass,
1638
interface=None, use_ipv6=True):
1932
interface=None, use_ipv6=True, socketfd=None):
1933
"""If socketfd is set, use that file descriptor instead of
1934
creating a new one with socket.socket().
1935
"""
1639
1936
self.interface = interface
1640
1937
if use_ipv6:
1641
1938
self.address_family = socket.AF_INET6
1939
if socketfd is not None:
1940
# Save the file descriptor
1941
self.socketfd = socketfd
1942
# Save the original socket.socket() function
1943
self.socket_socket = socket.socket
1944
# To implement --socket, we monkey patch socket.socket.
1945
#
1946
# (When socketserver.TCPServer is a new-style class, we
1947
# could make self.socket into a property instead of monkey
1948
# patching socket.socket.)
1949
#
1950
# Create a one-time-only replacement for socket.socket()
1951
@functools.wraps(socket.socket)
1952
def socket_wrapper(*args, **kwargs):
1953
# Restore original function so subsequent calls are
1954
# not affected.
1955
socket.socket = self.socket_socket
1956
del self.socket_socket
1957
# This time only, return a new socket object from the
1958
# saved file descriptor.
1959
return socket.fromfd(self.socketfd, *args, **kwargs)
1960
# Replace socket.socket() function with wrapper
1961
socket.socket = socket_wrapper
1962
# The socketserver.TCPServer.__init__ will call
1963
# socket.socket(), which might be our replacement,
1964
# socket_wrapper(), if socketfd was set.
1642
1965
socketserver.TCPServer.__init__(self, server_address,
1643
1966
RequestHandlerClass)
1967
1644
1968
def server_bind(self):
1645
1969
"""This overrides the normal server_bind() function
1646
1970
to bind to an interface if one was specified, and also NOT to
1654
1978
try:
1655
1979
self.socket.setsockopt(socket.SOL_SOCKET,
1656
1980
SO_BINDTODEVICE,
1657
str(self.interface
1658
+ '\0'))
1981
str(self.interface + '\0'))
1659
1982
except socket.error as error:
1660
if error[0] == errno.EPERM:
1661
logger.error("No permission to"
1662
" bind to interface %s",
1663
self.interface)
1664
elif error[0] == errno.ENOPROTOOPT:
1983
if error.errno == errno.EPERM:
1984
logger.error("No permission to bind to"
1985
" interface %s", self.interface)
1986
elif error.errno == errno.ENOPROTOOPT:
1665
1987
logger.error("SO_BINDTODEVICE not available;"
1666
1988
" cannot bind to interface %s",
1667
1989
self.interface)
1990
elif error.errno == errno.ENODEV:
1991
logger.error("Interface %s does not exist,"
1992
" cannot bind", self.interface)
1668
1993
else:
1669
1994
raise
1670
1995
# Only bind(2) the socket if we really need to.
1673
1998
if self.address_family == socket.AF_INET6:
1674
1999
any_address = "::" # in6addr_any
1675
2000
else:
1676
any_address = socket.INADDR_ANY
2001
any_address = "0.0.0.0" # INADDR_ANY
1677
2002
self.server_address = (any_address,
1678
2003
self.server_address[1])
1679
2004
elif not self.server_address[1]:
1700
2025
"""
1701
2026
def __init__(self, server_address, RequestHandlerClass,
1702
2027
interface=None, use_ipv6=True, clients=None,
1703
gnutls_priority=None, use_dbus=True):
2028
gnutls_priority=None, use_dbus=True, socketfd=None):
1704
2029
self.enabled = False
1705
2030
self.clients = clients
1706
2031
if self.clients is None:
1710
2035
IPv6_TCPServer.__init__(self, server_address,
1711
2036
RequestHandlerClass,
1712
2037
interface = interface,
1713
use_ipv6 = use_ipv6)
2038
use_ipv6 = use_ipv6,
2039
socketfd = socketfd)
1714
2040
def server_activate(self):
1715
2041
if self.enabled:
1716
2042
return socketserver.TCPServer.server_activate(self)
1729
2055
1730
2056
def handle_ipc(self, source, condition, parent_pipe=None,
1731
2057
proc = None, client_object=None):
1732
condition_names = {
1733
gobject.IO_IN: "IN", # There is data to read.
1734
gobject.IO_OUT: "OUT", # Data can be written (without
1735
# blocking).
1736
gobject.IO_PRI: "PRI", # There is urgent data to read.
1737
gobject.IO_ERR: "ERR", # Error condition.
1738
gobject.IO_HUP: "HUP" # Hung up (the connection has been
1739
# broken, usually for pipes and
1740
# sockets).
1741
}
1742
conditions_string = ' | '.join(name
1743
for cond, name in
1744
condition_names.iteritems()
1745
if cond & condition)
1746
2058
# error, or the other end of multiprocessing.Pipe has closed
1747
if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
2059
if condition & (gobject.IO_ERR | gobject.IO_HUP):
1748
2060
# Wait for other process to exit
1749
2061
proc.join()
1750
2062
return False
1808
2120
return True
1809
2121
1810
2122
2123
def rfc3339_duration_to_delta(duration):
2124
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
2125
2126
>>> rfc3339_duration_to_delta("P7D")
2127
datetime.timedelta(7)
2128
>>> rfc3339_duration_to_delta("PT60S")
2129
datetime.timedelta(0, 60)
2130
>>> rfc3339_duration_to_delta("PT60M")
2131
datetime.timedelta(0, 3600)
2132
>>> rfc3339_duration_to_delta("PT24H")
2133
datetime.timedelta(1)
2134
>>> rfc3339_duration_to_delta("P1W")
2135
datetime.timedelta(7)
2136
>>> rfc3339_duration_to_delta("PT5M30S")
2137
datetime.timedelta(0, 330)
2138
>>> rfc3339_duration_to_delta("P1DT3M20S")
2139
datetime.timedelta(1, 200)
2140
"""
2141
2142
# Parsing an RFC 3339 duration with regular expressions is not
2143
# possible - there would have to be multiple places for the same
2144
# values, like seconds. The current code, while more esoteric, is
2145
# cleaner without depending on a parsing library. If Python had a
2146
# built-in library for parsing we would use it, but we'd like to
2147
# avoid excessive use of external libraries.
2148
2149
# New type for defining tokens, syntax, and semantics all-in-one
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
2159
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2160
# the "duration" ABNF definition in RFC 3339, Appendix A.
2161
token_end = Token(re.compile(r"$"), None, frozenset())
2162
token_second = Token(re.compile(r"(\d+)S"),
2163
datetime.timedelta(seconds=1),
2164
frozenset((token_end,)))
2165
token_minute = Token(re.compile(r"(\d+)M"),
2166
datetime.timedelta(minutes=1),
2167
frozenset((token_second, token_end)))
2168
token_hour = Token(re.compile(r"(\d+)H"),
2169
datetime.timedelta(hours=1),
2170
frozenset((token_minute, token_end)))
2171
token_time = Token(re.compile(r"T"),
2172
None,
2173
frozenset((token_hour, token_minute,
2174
token_second)))
2175
token_day = Token(re.compile(r"(\d+)D"),
2176
datetime.timedelta(days=1),
2177
frozenset((token_time, token_end)))
2178
token_month = Token(re.compile(r"(\d+)M"),
2179
datetime.timedelta(weeks=4),
2180
frozenset((token_day, token_end)))
2181
token_year = Token(re.compile(r"(\d+)Y"),
2182
datetime.timedelta(weeks=52),
2183
frozenset((token_month, token_end)))
2184
token_week = Token(re.compile(r"(\d+)W"),
2185
datetime.timedelta(weeks=1),
2186
frozenset((token_end,)))
2187
token_duration = Token(re.compile(r"P"), None,
2188
frozenset((token_year, token_month,
2189
token_day, token_time,
2190
token_week))),
2191
# Define starting values
2192
value = datetime.timedelta() # Value so far
2193
found_token = None
2194
followers = frozenset(token_duration,) # Following valid tokens
2195
s = duration # String left to parse
2196
# Loop until end token is found
2197
while found_token is not token_end:
2198
# Search for any currently valid tokens
2199
for token in followers:
2200
match = token.regexp.match(s)
2201
if match is not None:
2202
# Token found
2203
if token.value is not None:
2204
# Value found, parse digits
2205
factor = int(match.group(1), 10)
2206
# Add to value so far
2207
value += factor * token.value
2208
# Strip token from string
2209
s = token.regexp.sub("", s, 1)
2210
# Go to found token
2211
found_token = token
2212
# Set valid next tokens
2213
followers = found_token.followers
2214
break
2215
else:
2216
# No currently valid tokens were found
2217
raise ValueError("Invalid RFC 3339 duration")
2218
# End token found
2219
return value
2220
2221
1811
2222
def string_to_delta(interval):
1812
2223
"""Parse a string and return a datetime.timedelta
1813
2224
1824
2235
>>> string_to_delta('5m 30s')
1825
2236
datetime.timedelta(0, 330)
1826
2237
"""
2238
2239
try:
2240
return rfc3339_duration_to_delta(interval)
2241
except ValueError:
2242
pass
2243
1827
2244
timevalue = datetime.timedelta(0)
1828
2245
for s in interval.split():
1829
2246
try:
1840
2257
elif suffix == "w":
1841
2258
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1842
2259
else:
1843
raise ValueError("Unknown suffix %r" % suffix)
1844
except (ValueError, IndexError) as e:
2260
raise ValueError("Unknown suffix {0!r}"
2261
.format(suffix))
2262
except IndexError as e:
1845
2263
raise ValueError(*(e.args))
1846
2264
timevalue += delta
1847
2265
return timevalue
1848
2266
1849
2267
1850
def if_nametoindex(interface):
1851
"""Call the C function if_nametoindex(), or equivalent
1852
1853
Note: This function cannot accept a unicode string."""
1854
global if_nametoindex
1855
try:
1856
if_nametoindex = (ctypes.cdll.LoadLibrary
1857
(ctypes.util.find_library("c"))
1858
.if_nametoindex)
1859
except (OSError, AttributeError):
1860
logger.warning("Doing if_nametoindex the hard way")
1861
def if_nametoindex(interface):
1862
"Get an interface index the hard way, i.e. using fcntl()"
1863
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
1864
with contextlib.closing(socket.socket()) as s:
1865
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1866
struct.pack(str("16s16x"),
1867
interface))
1868
interface_index = struct.unpack(str("I"),
1869
ifreq[16:20])[0]
1870
return interface_index
1871
return if_nametoindex(interface)
1872
1873
1874
2268
def daemon(nochdir = False, noclose = False):
1875
2269
"""See daemon(3). Standard BSD Unix function.
1876
2270
1884
2278
sys.exit()
1885
2279
if not noclose:
1886
2280
# Close all standard open file descriptors
1887
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2281
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
1888
2282
if not stat.S_ISCHR(os.fstat(null).st_mode):
1889
2283
raise OSError(errno.ENODEV,
1890
"%s not a character device"
1891
% os.path.devnull)
2284
"{0} not a character device"
2285
.format(os.devnull))
1892
2286
os.dup2(null, sys.stdin.fileno())
1893
2287
os.dup2(null, sys.stdout.fileno())
1894
2288
os.dup2(null, sys.stderr.fileno())
1903
2297
1904
2298
parser = argparse.ArgumentParser()
1905
2299
parser.add_argument("-v", "--version", action="version",
1906
version = "%%(prog)s %s" % version,
2300
version = "%(prog)s {0}".format(version),
1907
2301
help="show version number and exit")
1908
2302
parser.add_argument("-i", "--interface", metavar="IF",
1909
2303
help="Bind to interface IF")
1915
2309
help="Run self-test")
1916
2310
parser.add_argument("--debug", action="store_true",
1917
2311
help="Debug mode; run in foreground and log"
1918
" to terminal")
2312
" to terminal", default=None)
1919
2313
parser.add_argument("--debuglevel", metavar="LEVEL",
1920
2314
help="Debug level for stdout output")
1921
2315
parser.add_argument("--priority", help="GnuTLS"
1928
2322
" files")
1929
2323
parser.add_argument("--no-dbus", action="store_false",
1930
2324
dest="use_dbus", help="Do not provide D-Bus"
1931
" system bus interface")
2325
" system bus interface", default=None)
1932
2326
parser.add_argument("--no-ipv6", action="store_false",
1933
dest="use_ipv6", help="Do not use IPv6")
2327
dest="use_ipv6", help="Do not use IPv6",
2328
default=None)
1934
2329
parser.add_argument("--no-restore", action="store_false",
1935
dest="restore",
1936
help="Do not restore stored state",
1937
default=True)
1938
2330
dest="restore", help="Do not restore stored"
2331
" state", default=None)
2332
parser.add_argument("--socket", type=int,
2333
help="Specify a file descriptor to a network"
2334
" socket to use instead of creating one")
2335
parser.add_argument("--statedir", metavar="DIR",
2336
help="Directory to save/restore state in")
2337
parser.add_argument("--foreground", action="store_true",
2338
help="Run in foreground", default=None)
2339
1939
2340
options = parser.parse_args()
1940
2341
1941
2342
if options.check:
1942
2343
import doctest
1943
doctest.testmod()
1944
sys.exit()
2344
fail_count, test_count = doctest.testmod()
2345
sys.exit(os.EX_OK if fail_count == 0 else 1)
1945
2346
1946
2347
# Default values for config file for server-global settings
1947
2348
server_defaults = { "interface": "",
1949
2350
"port": "",
1950
2351
"debug": "False",
1951
2352
"priority":
1952
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
2353
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:+SIGN-RSA-SHA224:+SIGN-RSA-RMD160",
1953
2354
"servicename": "Mandos",
1954
2355
"use_dbus": "True",
1955
2356
"use_ipv6": "True",
1956
2357
"debuglevel": "",
2358
"restore": "True",
2359
"socket": "",
2360
"statedir": "/var/lib/mandos",
2361
"foreground": "False",
1957
2362
}
1958
2363
1959
2364
# Parse config file for server-global settings
1964
2369
# Convert the SafeConfigParser object to a dict
1965
2370
server_settings = server_config.defaults()
1966
2371
# Use the appropriate methods on the non-string config options
1967
for option in ("debug", "use_dbus", "use_ipv6"):
2372
for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
1968
2373
server_settings[option] = server_config.getboolean("DEFAULT",
1969
2374
option)
1970
2375
if server_settings["port"]:
1971
2376
server_settings["port"] = server_config.getint("DEFAULT",
1972
2377
"port")
2378
if server_settings["socket"]:
2379
server_settings["socket"] = server_config.getint("DEFAULT",
2380
"socket")
2381
# Later, stdin will, and stdout and stderr might, be dup'ed
2382
# over with an opened os.devnull. But we don't want this to
2383
# happen with a supplied network socket.
2384
if 0 <= server_settings["socket"] <= 2:
2385
server_settings["socket"] = os.dup(server_settings
2386
["socket"])
1973
2387
del server_config
1974
2388
1975
2389
# Override the settings from the config file with command line
1976
2390
# options, if set.
1977
2391
for option in ("interface", "address", "port", "debug",
1978
2392
"priority", "servicename", "configdir",
1979
"use_dbus", "use_ipv6", "debuglevel", "restore"):
2393
"use_dbus", "use_ipv6", "debuglevel", "restore",
2394
"statedir", "socket", "foreground"):
1980
2395
value = getattr(options, option)
1981
2396
if value is not None:
1982
2397
server_settings[option] = value
1985
2400
for option in server_settings.keys():
1986
2401
if type(server_settings[option]) is str:
1987
2402
server_settings[option] = unicode(server_settings[option])
2403
# Force all boolean options to be boolean
2404
for option in ("debug", "use_dbus", "use_ipv6", "restore",
2405
"foreground"):
2406
server_settings[option] = bool(server_settings[option])
2407
# Debug implies foreground
2408
if server_settings["debug"]:
2409
server_settings["foreground"] = True
1988
2410
# Now we have our good server settings in "server_settings"
1989
2411
1990
2412
##################################################################
1994
2416
debuglevel = server_settings["debuglevel"]
1995
2417
use_dbus = server_settings["use_dbus"]
1996
2418
use_ipv6 = server_settings["use_ipv6"]
2419
stored_state_path = os.path.join(server_settings["statedir"],
2420
stored_state_file)
2421
foreground = server_settings["foreground"]
2422
2423
if debug:
2424
initlogger(debug, logging.DEBUG)
2425
else:
2426
if not debuglevel:
2427
initlogger(debug)
2428
else:
2429
level = getattr(logging, debuglevel.upper())
2430
initlogger(debug, level)
1997
2431
1998
2432
if server_settings["servicename"] != "Mandos":
1999
2433
syslogger.setFormatter(logging.Formatter
2000
('Mandos (%s) [%%(process)d]:'
2001
' %%(levelname)s: %%(message)s'
2002
% server_settings["servicename"]))
2434
('Mandos ({0}) [%(process)d]:'
2435
' %(levelname)s: %(message)s'
2436
.format(server_settings
2437
["servicename"])))
2003
2438
2004
2439
# Parse config file with clients
2005
client_defaults = { "timeout": "5m",
2006
"extended_timeout": "15m",
2007
"interval": "2m",
2008
"checker": "fping -q -- %%(host)s",
2009
"host": "",
2010
"approval_delay": "0s",
2011
"approval_duration": "1s",
2012
}
2013
client_config = configparser.SafeConfigParser(client_defaults)
2440
client_config = configparser.SafeConfigParser(Client
2441
.client_defaults)
2014
2442
client_config.read(os.path.join(server_settings["configdir"],
2015
2443
"clients.conf"))
2016
2444
2025
2453
use_ipv6=use_ipv6,
2026
2454
gnutls_priority=
2027
2455
server_settings["priority"],
2028
use_dbus=use_dbus)
2029
if not debug:
2030
pidfilename = "/var/run/mandos.pid"
2456
use_dbus=use_dbus,
2457
socketfd=(server_settings["socket"]
2458
or None))
2459
if not foreground:
2460
pidfilename = "/run/mandos.pid"
2461
if not os.path.isdir("/run/."):
2462
pidfilename = "/var/run/mandos.pid"
2463
pidfile = None
2031
2464
try:
2032
2465
pidfile = open(pidfilename, "w")
2033
except IOError:
2034
logger.error("Could not open file %r", pidfilename)
2466
except IOError as e:
2467
logger.error("Could not open file %r", pidfilename,
2468
exc_info=e)
2035
2469
2036
try:
2037
uid = pwd.getpwnam("_mandos").pw_uid
2038
gid = pwd.getpwnam("_mandos").pw_gid
2039
except KeyError:
2470
for name in ("_mandos", "mandos", "nobody"):
2040
2471
try:
2041
uid = pwd.getpwnam("mandos").pw_uid
2042
gid = pwd.getpwnam("mandos").pw_gid
2472
uid = pwd.getpwnam(name).pw_uid
2473
gid = pwd.getpwnam(name).pw_gid
2474
break
2043
2475
except KeyError:
2044
try:
2045
uid = pwd.getpwnam("nobody").pw_uid
2046
gid = pwd.getpwnam("nobody").pw_gid
2047
except KeyError:
2048
uid = 65534
2049
gid = 65534
2476
continue
2477
else:
2478
uid = 65534
2479
gid = 65534
2050
2480
try:
2051
2481
os.setgid(gid)
2052
2482
os.setuid(uid)
2053
2483
except OSError as error:
2054
if error[0] != errno.EPERM:
2055
raise error
2056
2057
if not debug and not debuglevel:
2058
logger.setLevel(logging.WARNING)
2059
if debuglevel:
2060
level = getattr(logging, debuglevel.upper())
2061
logger.setLevel(level)
2484
if error.errno != errno.EPERM:
2485
raise
2062
2486
2063
2487
if debug:
2064
logger.setLevel(logging.DEBUG)
2065
2488
# Enable all possible GnuTLS debugging
2066
2489
2067
2490
# "Use a log level over 10 to enable all debugging options."
2076
2499
.gnutls_global_set_log_function(debug_gnutls))
2077
2500
2078
2501
# Redirect stdin so all checkers get /dev/null
2079
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2502
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2080
2503
os.dup2(null, sys.stdin.fileno())
2081
2504
if null > 2:
2082
2505
os.close(null)
2083
else:
2084
# No console logging
2085
logger.removeHandler(console)
2086
2506
2087
2507
# Need to fork before connecting to D-Bus
2088
if not debug:
2508
if not foreground:
2089
2509
# Close all input and output, do double fork, etc.
2090
2510
daemon()
2091
2511
2512
# multiprocessing will use threads, so before we use gobject we
2513
# need to inform gobject that threads will be used.
2514
gobject.threads_init()
2515
2092
2516
global main_loop
2093
2517
# From the Avahi example code
2094
DBusGMainLoop(set_as_default=True )
2518
DBusGMainLoop(set_as_default=True)
2095
2519
main_loop = gobject.MainLoop()
2096
2520
bus = dbus.SystemBus()
2097
2521
# End of Avahi example code
2103
2527
("se.bsnet.fukt.Mandos", bus,
2104
2528
do_not_queue=True))
2105
2529
except dbus.exceptions.NameExistsException as e:
2106
logger.error(unicode(e) + ", disabling D-Bus")
2530
logger.error("Disabling D-Bus:", exc_info=e)
2107
2531
use_dbus = False
2108
2532
server_settings["use_dbus"] = False
2109
2533
tcp_server.use_dbus = False
2121
2545
2122
2546
client_class = Client
2123
2547
if use_dbus:
2124
client_class = functools.partial(ClientDBusTransitional,
2125
bus = bus)
2126
2127
special_settings = {
2128
# Some settings need to be accessd by special methods;
2129
# booleans need .getboolean(), etc. Here is a list of them:
2130
"approved_by_default":
2131
lambda section:
2132
client_config.getboolean(section, "approved_by_default"),
2133
}
2134
# Construct a new dict of client settings of this form:
2135
# { client_name: {setting_name: value, ...}, ...}
2136
# with exceptions for any special settings as defined above
2137
client_settings = dict((clientname,
2138
dict((setting,
2139
(value if
2140
setting not in special_settings
2141
else special_settings[setting]
2142
(clientname)))
2143
for setting, value
2144
in client_config.items(clientname)))
2145
for clientname in client_config.sections())
2146
2548
client_class = functools.partial(ClientDBus, bus = bus)
2549
2550
client_settings = Client.config_parser(client_config)
2147
2551
old_client_settings = {}
2148
clients_data = []
2149
2150
# Get client data and settings from last running state.
2552
clients_data = {}
2553
2554
# This is used to redirect stdout and stderr for checker processes
2555
global wnull
2556
wnull = open(os.devnull, "w") # A writable /dev/null
2557
# Only used if server is running in foreground but not in debug
2558
# mode
2559
if debug or not foreground:
2560
wnull.close()
2561
2562
# Get client data and settings from last running state.
2151
2563
if server_settings["restore"]:
2152
2564
try:
2153
2565
with open(stored_state_path, "rb") as stored_state:
2154
clients_data, old_client_settings = (
2155
pickle.load(stored_state))
2566
clients_data, old_client_settings = (pickle.load
2567
(stored_state))
2156
2568
os.remove(stored_state_path)
2157
2569
except IOError as e:
2158
logger.warning("Could not load persistant state: {0}"
2159
.format(e))
2160
if e.errno != errno.ENOENT:
2570
if e.errno == errno.ENOENT:
2571
logger.warning("Could not load persistent state: {0}"
2572
.format(os.strerror(e.errno)))
2573
else:
2574
logger.critical("Could not load persistent state:",
2575
exc_info=e)
2161
2576
raise
2162
2163
for client in clients_data:
2164
client_name = client["name"]
2165
2166
# Decide which value to use after restoring saved state.
2167
# We have three different values: Old config file,
2168
# new config file, and saved state.
2169
# New config value takes precedence if it differs from old
2170
# config value, otherwise use saved state.
2171
for name, value in client_settings[client_name].items():
2577
except EOFError as e:
2578
logger.warning("Could not load persistent state: "
2579
"EOFError:", exc_info=e)
2580
2581
with PGPEngine() as pgp:
2582
for client_name, client in clients_data.iteritems():
2583
# Skip removed clients
2584
if client_name not in client_settings:
2585
continue
2586
2587
# Decide which value to use after restoring saved state.
2588
# We have three different values: Old config file,
2589
# new config file, and saved state.
2590
# New config value takes precedence if it differs from old
2591
# config value, otherwise use saved state.
2592
for name, value in client_settings[client_name].items():
2593
try:
2594
# For each value in new config, check if it
2595
# differs from the old config value (Except for
2596
# the "secret" attribute)
2597
if (name != "secret" and
2598
value != old_client_settings[client_name]
2599
[name]):
2600
client[name] = value
2601
except KeyError:
2602
pass
2603
2604
# Clients who has passed its expire date can still be
2605
# enabled if its last checker was successful. Clients
2606
# whose checker succeeded before we stored its state is
2607
# assumed to have successfully run all checkers during
2608
# downtime.
2609
if client["enabled"]:
2610
if datetime.datetime.utcnow() >= client["expires"]:
2611
if not client["last_checked_ok"]:
2612
logger.warning(
2613
"disabling client {0} - Client never "
2614
"performed a successful checker"
2615
.format(client_name))
2616
client["enabled"] = False
2617
elif client["last_checker_status"] != 0:
2618
logger.warning(
2619
"disabling client {0} - Client "
2620
"last checker failed with error code {1}"
2621
.format(client_name,
2622
client["last_checker_status"]))
2623
client["enabled"] = False
2624
else:
2625
client["expires"] = (datetime.datetime
2626
.utcnow()
2627
+ client["timeout"])
2628
logger.debug("Last checker succeeded,"
2629
" keeping {0} enabled"
2630
.format(client_name))
2172
2631
try:
2173
# For each value in new config, check if it differs
2174
# from the old config value (Except for the "secret"
2175
# attribute)
2176
if (name != "secret" and
2177
value != old_client_settings[client_name][name]):
2178
setattr(client, name, value)
2179
except KeyError:
2180
pass
2181
2182
# Clients who has passed its expire date, can still be enabled
2183
# if its last checker was sucessful. Clients who checkers
2184
# failed before we stored it state is asumed to had failed
2185
# checker during downtime.
2186
if client["enabled"] and client["last_checked_ok"]:
2187
if ((datetime.datetime.utcnow()
2188
- client["last_checked_ok"]) > client["interval"]):
2189
if client["last_checker_status"] != 0:
2190
client["enabled"] = False
2191
else:
2192
client["expires"] = (datetime.datetime.utcnow()
2193
+ client["timeout"])
2194
2195
client["changedstate"] = (multiprocessing_manager
2196
.Condition(multiprocessing_manager
2197
.Lock()))
2198
if use_dbus:
2199
new_client = ClientDBusTransitional.__new__(
2200
ClientDBusTransitional)
2201
tcp_server.clients[client_name] = new_client
2202
new_client.bus = bus
2203
for name, value in client.iteritems():
2204
setattr(new_client, name, value)
2205
new_client._approvals_pending = 0
2206
new_client.add_to_dbus()
2207
else:
2208
tcp_server.clients[client_name] = Client.__new__(Client)
2209
for name, value in client.iteritems():
2210
setattr(tcp_server.clients[client_name], name, value)
2211
2212
tcp_server.clients[client_name].decrypt_secret(
2213
client_settings[client_name]["secret"])
2214
2215
# Create/remove clients based on new changes made to config
2216
for clientname in set(old_client_settings) - set(client_settings):
2217
del tcp_server.clients[clientname]
2218
for clientname in set(client_settings) - set(old_client_settings):
2219
tcp_server.clients[clientname] = client_class(name
2220
= clientname,
2221
config =
2222
client_settings
2223
[clientname])
2632
client["secret"] = (
2633
pgp.decrypt(client["encrypted_secret"],
2634
client_settings[client_name]
2635
["secret"]))
2636
except PGPError:
2637
# If decryption fails, we use secret from new settings
2638
logger.debug("Failed to decrypt {0} old secret"
2639
.format(client_name))
2640
client["secret"] = (
2641
client_settings[client_name]["secret"])
2642
2643
# Add/remove clients based on new changes made to config
2644
for client_name in (set(old_client_settings)
2645
- set(client_settings)):
2646
del clients_data[client_name]
2647
for client_name in (set(client_settings)
2648
- set(old_client_settings)):
2649
clients_data[client_name] = client_settings[client_name]
2650
2651
# Create all client objects
2652
for client_name, client in clients_data.iteritems():
2653
tcp_server.clients[client_name] = client_class(
2654
name = client_name, settings = client,
2655
server_settings = server_settings)
2224
2656
2225
2657
if not tcp_server.clients:
2226
2658
logger.warning("No clients defined")
2227
2228
if not debug:
2229
try:
2230
with pidfile:
2231
pid = os.getpid()
2232
pidfile.write(str(pid) + "\n".encode("utf-8"))
2233
del pidfile
2234
except IOError:
2235
logger.error("Could not write to file %r with PID %d",
2236
pidfilename, pid)
2237
except NameError:
2238
# "pidfile" was never created
2239
pass
2659
2660
if not foreground:
2661
if pidfile is not None:
2662
try:
2663
with pidfile:
2664
pid = os.getpid()
2665
pidfile.write(str(pid) + "\n".encode("utf-8"))
2666
except IOError:
2667
logger.error("Could not write to file %r with PID %d",
2668
pidfilename, pid)
2669
del pidfile
2240
2670
del pidfilename
2241
2242
signal.signal(signal.SIGINT, signal.SIG_IGN)
2243
2671
2244
2672
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2245
2673
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2246
2674
2247
2675
if use_dbus:
2248
class MandosDBusService(dbus.service.Object):
2676
@alternate_dbus_interfaces({"se.recompile.Mandos":
2677
"se.bsnet.fukt.Mandos"})
2678
class MandosDBusService(DBusObjectWithProperties):
2249
2679
"""A D-Bus proxy object"""
2250
2680
def __init__(self):
2251
2681
dbus.service.Object.__init__(self, bus, "/")
2252
2682
_interface = "se.recompile.Mandos"
2253
2683
2684
@dbus_interface_annotations(_interface)
2685
def _foo(self):
2686
return { "org.freedesktop.DBus.Property"
2687
".EmitsChangedSignal":
2688
"false"}
2689
2254
2690
@dbus.service.signal(_interface, signature="o")
2255
2691
def ClientAdded(self, objpath):
2256
2692
"D-Bus signal"
2298
2734
2299
2735
del _interface
2300
2736
2301
class MandosDBusServiceTransitional(MandosDBusService):
2302
__metaclass__ = AlternateDBusNamesMetaclass
2303
mandos_dbus_service = MandosDBusServiceTransitional()
2737
mandos_dbus_service = MandosDBusService()
2304
2738
2305
2739
def cleanup():
2306
2740
"Cleanup function; run on exit"
2307
2741
service.cleanup()
2308
2742
2309
2743
multiprocessing.active_children()
2744
wnull.close()
2310
2745
if not (tcp_server.clients or client_settings):
2311
2746
return
2312
2747
2313
2748
# Store client before exiting. Secrets are encrypted with key
2314
2749
# based on what config file has. If config file is
2315
2750
# removed/edited, old secret will thus be unrecovable.
2316
clients = []
2317
for client in tcp_server.clients.itervalues():
2318
client.encrypt_secret(
2319
client_settings[client.name]["secret"])
2320
2321
client_dict = {}
2322
2323
# A list of attributes that will not be stored when
2324
# shutting down.
2325
exclude = set(("bus", "changedstate", "secret"))
2326
for name, typ in inspect.getmembers(dbus.service.Object):
2327
exclude.add(name)
2328
2329
client_dict["encrypted_secret"] = client.encrypted_secret
2330
for attr in client.client_structure:
2331
if attr not in exclude:
2332
client_dict[attr] = getattr(client, attr)
2333
2334
clients.append(client_dict)
2335
del client_settings[client.name]["secret"]
2336
2751
clients = {}
2752
with PGPEngine() as pgp:
2753
for client in tcp_server.clients.itervalues():
2754
key = client_settings[client.name]["secret"]
2755
client.encrypted_secret = pgp.encrypt(client.secret,
2756
key)
2757
client_dict = {}
2758
2759
# A list of attributes that can not be pickled
2760
# + secret.
2761
exclude = set(("bus", "changedstate", "secret",
2762
"checker", "server_settings"))
2763
for name, typ in (inspect.getmembers
2764
(dbus.service.Object)):
2765
exclude.add(name)
2766
2767
client_dict["encrypted_secret"] = (client
2768
.encrypted_secret)
2769
for attr in client.client_structure:
2770
if attr not in exclude:
2771
client_dict[attr] = getattr(client, attr)
2772
2773
clients[client.name] = client_dict
2774
del client_settings[client.name]["secret"]
2775
2337
2776
try:
2338
with os.fdopen(os.open(stored_state_path,
2339
os.O_CREAT|os.O_WRONLY|os.O_TRUNC,
2340
stat.S_IRUSR | stat.S_IWUSR),
2341
"wb") 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:
2342
2781
pickle.dump((clients, client_settings), stored_state)
2343
except IOError as e:
2344
logger.warning("Could not save persistant state: {0}"
2345
.format(e))
2346
if e.errno != errno.ENOENT:
2782
tempname=stored_state.name
2783
os.rename(tempname, stored_state_path)
2784
except (IOError, OSError) as e:
2785
if not debug:
2786
try:
2787
os.remove(tempname)
2788
except NameError:
2789
pass
2790
if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2791
logger.warning("Could not save persistent state: {0}"
2792
.format(os.strerror(e.errno)))
2793
else:
2794
logger.warning("Could not save persistent state:",
2795
exc_info=e)
2347
2796
raise
2348
2797
2349
2798
# Delete all clients, and settings from config
2350
2799
while tcp_server.clients:
2351
2800
name, client = tcp_server.clients.popitem()
2369
2818
# Need to initiate checking of clients
2370
2819
if client.enabled:
2371
2820
client.init_checker()
2372
2373
2821
2374
2822
tcp_server.enable()
2375
2823
tcp_server.server_activate()
2378
2826
service.port = tcp_server.socket.getsockname()[1]
2379
2827
if use_ipv6:
2380
2828
logger.info("Now listening on address %r, port %d,"
2381
" flowinfo %d, scope_id %d"
2382
% tcp_server.socket.getsockname())
2829
" flowinfo %d, scope_id %d",
2830
*tcp_server.socket.getsockname())
2383
2831
else: # IPv4
2384
logger.info("Now listening on address %r, port %d"
2385
% tcp_server.socket.getsockname())
2832
logger.info("Now listening on address %r, port %d",
2833
*tcp_server.socket.getsockname())
2386
2834
2387
2835
#service.interface = tcp_server.socket.getsockname()[3]
2388
2836
2391
2839
try:
2392
2840
service.activate()
2393
2841
except dbus.exceptions.DBusException as error:
2394
logger.critical("DBusException: %s", error)
2842
logger.critical("D-Bus Exception", exc_info=error)
2395
2843
cleanup()
2396
2844
sys.exit(1)
2397
2845
# End of Avahi example code
2404
2852
logger.debug("Starting main loop")
2405
2853
main_loop.run()
2406
2854
except AvahiError as error:
2407
logger.critical("AvahiError: %s", error)
2855
logger.critical("Avahi Error", exc_info=error)
2408
2856
cleanup()
2409
2857
sys.exit(1)
2410
2858
except KeyboardInterrupt:
2415
2863
# Must run before the D-Bus bus name gets deregistered
2416
2864
cleanup()
2417
2865
2418
2419
2866
if __name__ == '__main__':
2420
2867
main()
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0