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 474
- compare with another revision
- download diff
- download tarball
- view history from revision 474
- Committer: teddy at bsnet
- Date: 2011-03-15 19:15:24 UTC
- Revision ID: teddy@fukt.bsnet.se-20110315191524-jc3ajgqu2za7dcly
* mandos: Use the new argparse library instead of optparse.
* debian/control (mandos): Depend on python (<=2.7) | python-argparse
* debian/control (mandos): Depend on python (<=2.7) | python-argparse
- files removed:
- 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-2014 Teddy Hogeborn
15
# Copyright © 2008-2014 Björn Påhlsson
14
# Copyright © 2008-2011 Teddy Hogeborn
15
# Copyright © 2008-2011 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
28
28
# along with this program. If not, see
29
29
# <http://www.gnu.org/licenses/>.
30
30
#
31
# Contact the authors at <mandos@recompile.se>.
31
# Contact the authors at <mandos@fukt.bsnet.se>.
32
32
#
33
33
34
34
from __future__ import (division, absolute_import, print_function,
35
35
unicode_literals)
36
36
37
from future_builtins import *
38
39
37
import SocketServer as socketserver
40
38
import socket
41
39
import argparse
64
62
import functools
65
63
import cPickle as pickle
66
64
import multiprocessing
67
import types
68
import binascii
69
import tempfile
70
import itertools
71
import collections
72
65
73
66
import dbus
74
67
import dbus.service
88
81
except ImportError:
89
82
SO_BINDTODEVICE = None
90
83
91
version = "1.6.4"
92
stored_state_file = "clients.pickle"
93
94
logger = logging.getLogger()
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
221
84
85
version = "1.3.0"
86
87
#logger = logging.getLogger('mandos')
88
logger = logging.Logger('mandos')
89
syslogger = (logging.handlers.SysLogHandler
90
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
91
address = str("/dev/log")))
92
syslogger.setFormatter(logging.Formatter
93
('Mandos [%(process)d]: %(levelname)s:'
94
' %(message)s'))
95
logger.addHandler(syslogger)
96
97
console = logging.StreamHandler()
98
console.setFormatter(logging.Formatter('%(name)s [%(process)d]:'
99
' %(levelname)s:'
100
' %(message)s'))
101
logger.addHandler(console)
222
102
223
103
class AvahiError(Exception):
224
104
def __init__(self, value, *args, **kwargs):
242
122
Used to optionally bind to the specified interface.
243
123
name: string; Example: 'Mandos'
244
124
type: string; Example: '_mandos._tcp'.
245
See <https://www.iana.org/assignments/service-names-port-numbers>
125
See <http://www.dns-sd.org/ServiceTypes.html>
246
126
port: integer; what port to announce
247
127
TXT: list of strings; TXT record for the service
248
128
domain: string; Domain to publish on, default to .local if empty.
254
134
server: D-Bus Server
255
135
bus: dbus.SystemBus()
256
136
"""
257
258
137
def __init__(self, interface = avahi.IF_UNSPEC, name = None,
259
138
servicetype = None, port = None, TXT = None,
260
139
domain = "", host = "", max_renames = 32768,
272
151
self.group = None # our entry group
273
152
self.server = None
274
153
self.bus = bus
275
self.entry_group_state_changed_match = None
276
277
154
def rename(self):
278
155
"""Derived from the Avahi example code"""
279
156
if self.rename_count >= self.max_renames:
281
158
" after %i retries, exiting.",
282
159
self.rename_count)
283
160
raise AvahiServiceError("Too many renames")
284
self.name = unicode(self.server
285
.GetAlternativeServiceName(self.name))
161
self.name = unicode(self.server.GetAlternativeServiceName(self.name))
286
162
logger.info("Changing Zeroconf service name to %r ...",
287
163
self.name)
164
syslogger.setFormatter(logging.Formatter
165
('Mandos (%s) [%%(process)d]:'
166
' %%(levelname)s: %%(message)s'
167
% self.name))
288
168
self.remove()
289
169
try:
290
170
self.add()
291
except dbus.exceptions.DBusException as error:
292
logger.critical("D-Bus Exception", exc_info=error)
171
except dbus.exceptions.DBusException, error:
172
logger.critical("DBusException: %s", error)
293
173
self.cleanup()
294
174
os._exit(1)
295
175
self.rename_count += 1
296
297
176
def remove(self):
298
177
"""Derived from the Avahi example code"""
299
if self.entry_group_state_changed_match is not None:
300
self.entry_group_state_changed_match.remove()
301
self.entry_group_state_changed_match = None
302
178
if self.group is not None:
303
179
self.group.Reset()
304
305
180
def add(self):
306
181
"""Derived from the Avahi example code"""
307
self.remove()
308
182
if self.group is None:
309
183
self.group = dbus.Interface(
310
184
self.bus.get_object(avahi.DBUS_NAME,
311
185
self.server.EntryGroupNew()),
312
186
avahi.DBUS_INTERFACE_ENTRY_GROUP)
313
self.entry_group_state_changed_match = (
314
self.group.connect_to_signal(
315
'StateChanged', self.entry_group_state_changed))
187
self.group.connect_to_signal('StateChanged',
188
self
189
.entry_group_state_changed)
316
190
logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
317
191
self.name, self.type)
318
192
self.group.AddService(
324
198
dbus.UInt16(self.port),
325
199
avahi.string_array_to_txt_array(self.TXT))
326
200
self.group.Commit()
327
328
201
def entry_group_state_changed(self, state, error):
329
202
"""Derived from the Avahi example code"""
330
203
logger.debug("Avahi entry group state change: %i", state)
337
210
elif state == avahi.ENTRY_GROUP_FAILURE:
338
211
logger.critical("Avahi: Error in group state changed %s",
339
212
unicode(error))
340
raise AvahiGroupError("State changed: {0!s}"
341
.format(error))
342
213
raise AvahiGroupError("State changed: %s"
214
% unicode(error))
343
215
def cleanup(self):
344
216
"""Derived from the Avahi example code"""
345
217
if self.group is not None:
346
try:
347
self.group.Free()
348
except (dbus.exceptions.UnknownMethodException,
349
dbus.exceptions.DBusException):
350
pass
218
self.group.Free()
351
219
self.group = None
352
self.remove()
353
354
def server_state_changed(self, state, error=None):
220
def server_state_changed(self, state):
355
221
"""Derived from the Avahi example code"""
356
222
logger.debug("Avahi server state change: %i", state)
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" }
364
if state in bad_states:
365
if bad_states[state] is not None:
366
if error is None:
367
logger.error(bad_states[state])
368
else:
369
logger.error(bad_states[state] + ": %r", error)
370
self.cleanup()
223
if state == avahi.SERVER_COLLISION:
224
logger.error("Zeroconf server name collision")
225
self.remove()
371
226
elif state == avahi.SERVER_RUNNING:
372
227
self.add()
373
else:
374
if error is None:
375
logger.debug("Unknown state: %r", state)
376
else:
377
logger.debug("Unknown state: %r: %r", state, error)
378
379
228
def activate(self):
380
229
"""Derived from the Avahi example code"""
381
230
if self.server is None:
382
231
self.server = dbus.Interface(
383
232
self.bus.get_object(avahi.DBUS_NAME,
384
avahi.DBUS_PATH_SERVER,
385
follow_name_owner_changes=True),
233
avahi.DBUS_PATH_SERVER),
386
234
avahi.DBUS_INTERFACE_SERVER)
387
235
self.server.connect_to_signal("StateChanged",
388
236
self.server_state_changed)
389
237
self.server_state_changed(self.server.GetState())
390
238
391
239
392
class AvahiServiceToSyslog(AvahiService):
393
def rename(self):
394
"""Add the new name to the syslog messages"""
395
ret = AvahiService.rename(self)
396
syslogger.setFormatter(logging.Formatter
397
('Mandos ({0}) [%(process)d]:'
398
' %(levelname)s: %(message)s'
399
.format(self.name)))
400
return ret
401
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
410
240
class Client(object):
411
241
"""A representation of a client host served by this server.
412
242
413
243
Attributes:
414
approved: bool(); 'None' if not yet approved/disapproved
244
_approved: bool(); 'None' if not yet approved/disapproved
415
245
approval_delay: datetime.timedelta(); Time to wait for approval
416
246
approval_duration: datetime.timedelta(); Duration of one approval
417
247
checker: subprocess.Popen(); a running checker process used
424
254
instance %(name)s can be used in the command.
425
255
checker_initiator_tag: a gobject event source tag, or None
426
256
created: datetime.datetime(); (UTC) object creation
427
client_structure: Object describing what attributes a client has
428
and is used for storing the client at exit
429
257
current_checker_command: string; current running checker_command
258
disable_hook: If set, called by disable() as disable_hook(self)
430
259
disable_initiator_tag: a gobject event source tag, or None
431
260
enabled: bool()
432
261
fingerprint: string (40 or 32 hexadecimal digits); used to
435
264
interval: datetime.timedelta(); How often to start a new checker
436
265
last_approval_request: datetime.datetime(); (UTC) or None
437
266
last_checked_ok: datetime.datetime(); (UTC) or None
438
last_checker_status: integer between 0 and 255 reflecting exit
439
status of last checker. -1 reflects crashed
440
checker, -2 means no checker completed yet.
441
last_enabled: datetime.datetime(); (UTC) or None
267
last_enabled: datetime.datetime(); (UTC)
442
268
name: string; from the config file, used in log messages and
443
269
D-Bus identifiers
444
270
secret: bytestring; sent verbatim (over TLS) to client
445
271
timeout: datetime.timedelta(); How long from last_checked_ok
446
272
until this client is disabled
447
extended_timeout: extra long timeout when secret has been sent
448
273
runtime_expansions: Allowed attributes for runtime expansion.
449
expires: datetime.datetime(); time (UTC) when a client will be
450
disabled, or None
451
server_settings: The server_settings dict from main()
452
274
"""
453
275
454
276
runtime_expansions = ("approval_delay", "approval_duration",
455
"created", "enabled", "expires",
456
"fingerprint", "host", "interval",
457
"last_approval_request", "last_checked_ok",
277
"created", "enabled", "fingerprint",
278
"host", "interval", "last_checked_ok",
458
279
"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
}
280
281
@staticmethod
282
def _timedelta_to_milliseconds(td):
283
"Convert a datetime.timedelta() to milliseconds"
284
return ((td.days * 24 * 60 * 60 * 1000)
285
+ (td.seconds * 1000)
286
+ (td.microseconds // 1000))
469
287
470
288
def timeout_milliseconds(self):
471
289
"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)
290
return self._timedelta_to_milliseconds(self.timeout)
477
291
478
292
def interval_milliseconds(self):
479
293
"Return the 'interval' attribute in milliseconds"
480
return timedelta_to_milliseconds(self.interval)
481
294
return self._timedelta_to_milliseconds(self.interval)
295
482
296
def approval_delay_milliseconds(self):
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):
297
return self._timedelta_to_milliseconds(self.approval_delay)
298
299
def __init__(self, name = None, disable_hook=None, config=None):
300
"""Note: the 'checker' key in 'config' sets the
301
'checker_command' attribute and *not* the 'checker'
302
attribute."""
533
303
self.name = name
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
304
if config is None:
305
config = {}
551
306
logger.debug("Creating client %r", self.name)
552
307
# Uppercase and remove spaces from fingerprint for later
553
308
# comparison purposes with return value from the fingerprint()
554
309
# function
310
self.fingerprint = (config["fingerprint"].upper()
311
.replace(" ", ""))
555
312
logger.debug(" Fingerprint: %s", self.fingerprint)
556
self.created = settings.get("created",
557
datetime.datetime.utcnow())
558
559
# attributes specific for this server instance
313
if "secret" in config:
314
self.secret = config["secret"].decode("base64")
315
elif "secfile" in config:
316
with open(os.path.expanduser(os.path.expandvars
317
(config["secfile"])),
318
"rb") as secfile:
319
self.secret = secfile.read()
320
else:
321
raise TypeError("No secret or secfile for client %s"
322
% self.name)
323
self.host = config.get("host", "")
324
self.created = datetime.datetime.utcnow()
325
self.enabled = False
326
self.last_approval_request = None
327
self.last_enabled = None
328
self.last_checked_ok = None
329
self.timeout = string_to_delta(config["timeout"])
330
self.interval = string_to_delta(config["interval"])
331
self.disable_hook = disable_hook
560
332
self.checker = None
561
333
self.checker_initiator_tag = None
562
334
self.disable_initiator_tag = None
563
335
self.checker_callback_tag = None
336
self.checker_command = config["checker"]
564
337
self.current_checker_command = None
565
self.approved = None
338
self.last_connect = None
339
self._approved = None
340
self.approved_by_default = config.get("approved_by_default",
341
True)
566
342
self.approvals_pending = 0
567
self.changedstate = (multiprocessing_manager
568
.Condition(multiprocessing_manager
569
.Lock()))
570
self.client_structure = [attr for attr in
571
self.__dict__.iterkeys()
572
if not attr.startswith("_")]
573
self.client_structure.append("client_structure")
574
575
for name, t in inspect.getmembers(type(self),
576
lambda obj:
577
isinstance(obj,
578
property)):
579
if not name.startswith("_"):
580
self.client_structure.append(name)
343
self.approval_delay = string_to_delta(
344
config["approval_delay"])
345
self.approval_duration = string_to_delta(
346
config["approval_duration"])
347
self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
581
348
582
# Send notice to process children that client state has changed
583
349
def send_changedstate(self):
584
with self.changedstate:
585
self.changedstate.notify_all()
586
350
self.changedstate.acquire()
351
self.changedstate.notify_all()
352
self.changedstate.release()
353
587
354
def enable(self):
588
355
"""Start this client's checker and timeout hooks"""
589
356
if getattr(self, "enabled", False):
590
357
# Already enabled
591
358
return
592
self.expires = datetime.datetime.utcnow() + self.timeout
593
self.enabled = True
359
self.send_changedstate()
594
360
self.last_enabled = datetime.datetime.utcnow()
595
self.init_checker()
596
self.send_changedstate()
597
598
def disable(self, quiet=True):
599
"""Disable this client."""
600
if not getattr(self, "enabled", False):
601
return False
602
if not quiet:
603
logger.info("Disabling client %s", self.name)
604
if getattr(self, "disable_initiator_tag", None) is not None:
605
gobject.source_remove(self.disable_initiator_tag)
606
self.disable_initiator_tag = None
607
self.expires = None
608
if getattr(self, "checker_initiator_tag", None) is not None:
609
gobject.source_remove(self.checker_initiator_tag)
610
self.checker_initiator_tag = None
611
self.stop_checker()
612
self.enabled = False
613
if not quiet:
614
self.send_changedstate()
615
# Do not run this again if called by a gobject.timeout_add
616
return False
617
618
def __del__(self):
619
self.disable()
620
621
def init_checker(self):
622
361
# Schedule a new checker to be started an 'interval' from now,
623
362
# and every interval from then on.
624
if self.checker_initiator_tag is not None:
625
gobject.source_remove(self.checker_initiator_tag)
626
363
self.checker_initiator_tag = (gobject.timeout_add
627
364
(self.interval_milliseconds(),
628
365
self.start_checker))
629
366
# Schedule a disable() when 'timeout' has passed
630
if self.disable_initiator_tag is not None:
631
gobject.source_remove(self.disable_initiator_tag)
632
367
self.disable_initiator_tag = (gobject.timeout_add
633
368
(self.timeout_milliseconds(),
634
369
self.disable))
370
self.enabled = True
635
371
# Also start a new checker *right now*.
636
372
self.start_checker()
637
373
374
def disable(self, quiet=True):
375
"""Disable this client."""
376
if not getattr(self, "enabled", False):
377
return False
378
if not quiet:
379
self.send_changedstate()
380
if not quiet:
381
logger.info("Disabling client %s", self.name)
382
if getattr(self, "disable_initiator_tag", False):
383
gobject.source_remove(self.disable_initiator_tag)
384
self.disable_initiator_tag = None
385
if getattr(self, "checker_initiator_tag", False):
386
gobject.source_remove(self.checker_initiator_tag)
387
self.checker_initiator_tag = None
388
self.stop_checker()
389
if self.disable_hook:
390
self.disable_hook(self)
391
self.enabled = False
392
# Do not run this again if called by a gobject.timeout_add
393
return False
394
395
def __del__(self):
396
self.disable_hook = None
397
self.disable()
398
638
399
def checker_callback(self, pid, condition, command):
639
400
"""The checker has completed, so take appropriate actions."""
640
401
self.checker_callback_tag = None
641
402
self.checker = None
642
403
if os.WIFEXITED(condition):
643
self.last_checker_status = os.WEXITSTATUS(condition)
644
if self.last_checker_status == 0:
404
exitstatus = os.WEXITSTATUS(condition)
405
if exitstatus == 0:
645
406
logger.info("Checker for %(name)s succeeded",
646
407
vars(self))
647
408
self.checked_ok()
649
410
logger.info("Checker for %(name)s failed",
650
411
vars(self))
651
412
else:
652
self.last_checker_status = -1
653
413
logger.warning("Checker for %(name)s crashed?",
654
414
vars(self))
655
415
656
416
def checked_ok(self):
657
"""Assert that the client has been seen, alive and well."""
417
"""Bump up the timeout for this client.
418
419
This should only be called when the client has been seen,
420
alive and well.
421
"""
658
422
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."""
664
if timeout is None:
665
timeout = self.timeout
666
if self.disable_initiator_tag is not None:
667
gobject.source_remove(self.disable_initiator_tag)
668
self.disable_initiator_tag = None
669
if getattr(self, "enabled", False):
670
self.disable_initiator_tag = (gobject.timeout_add
671
(timedelta_to_milliseconds
672
(timeout), self.disable))
673
self.expires = datetime.datetime.utcnow() + timeout
423
gobject.source_remove(self.disable_initiator_tag)
424
self.disable_initiator_tag = (gobject.timeout_add
425
(self.timeout_milliseconds(),
426
self.disable))
674
427
675
428
def need_approval(self):
676
429
self.last_approval_request = datetime.datetime.utcnow()
681
434
If a checker already exists, leave it running and do
682
435
nothing."""
683
436
# The reason for not killing a running checker is that if we
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
437
# did that, then if a checker (for some reason) started
438
# running slowly and taking more than 'interval' time, the
439
# client would inevitably timeout, since no checker would get
440
# a chance to run to completion. If we instead leave running
688
441
# checkers alone, the checker would have to take more time
689
442
# than 'timeout' for the client to be disabled, which is as it
690
443
# should be.
692
445
# If a checker exists, make sure it is not a zombie
693
446
try:
694
447
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
695
except AttributeError:
696
pass
697
except OSError as error:
698
if error.errno != errno.ECHILD:
699
raise
448
except (AttributeError, OSError), error:
449
if (isinstance(error, OSError)
450
and error.errno != errno.ECHILD):
451
raise error
700
452
else:
701
453
if pid:
702
454
logger.warning("Checker was a zombie")
705
457
self.current_checker_command)
706
458
# Start a new checker if needed
707
459
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)
713
460
try:
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
461
# In case checker_command has exactly one % operator
462
command = self.checker_command % self.host
463
except TypeError:
464
# Escape attributes for the shell
465
escaped_attrs = dict(
466
(attr,
467
re.escape(unicode(str(getattr(self, attr, "")),
468
errors=
469
'replace')))
470
for attr in
471
self.runtime_expansions)
472
473
try:
474
command = self.checker_command % escaped_attrs
475
except TypeError, error:
476
logger.error('Could not format string "%s":'
477
' %s', self.checker_command, error)
478
return True # Try again later
719
479
self.current_checker_command = command
720
480
try:
721
481
logger.info("Starting checker %r for %s",
724
484
# in normal mode, that is already done by daemon(),
725
485
# and in debug mode we don't want to. (Stdin is
726
486
# 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 })
735
487
self.checker = subprocess.Popen(command,
736
488
close_fds=True,
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:
489
shell=True, cwd="/")
490
self.checker_callback_tag = (gobject.child_watch_add
491
(self.checker.pid,
492
self.checker_callback,
493
data=command))
494
# The checker may have completed before the gobject
495
# watch was added. Check for this.
750
496
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
751
except OSError as 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)
497
if pid:
498
gobject.source_remove(self.checker_callback_tag)
499
self.checker_callback(pid, status, command)
500
except OSError, error:
501
logger.error("Failed to start subprocess: %s",
502
error)
761
503
# Re-run this periodically if run by gobject.timeout_add
762
504
return True
763
505
770
512
return
771
513
logger.debug("Stopping checker for %(name)s", vars(self))
772
514
try:
773
self.checker.terminate()
515
os.kill(self.checker.pid, signal.SIGTERM)
774
516
#time.sleep(0.5)
775
517
#if self.checker.poll() is None:
776
# self.checker.kill()
777
except OSError as error:
518
# os.kill(self.checker.pid, signal.SIGKILL)
519
except OSError, error:
778
520
if error.errno != errno.ESRCH: # No such process
779
521
raise
780
522
self.checker = None
781
523
782
783
524
def dbus_service_property(dbus_interface, signature="v",
784
525
access="readwrite", byte_arrays=False):
785
526
"""Decorators for marking methods of a DBusObjectWithProperties to
796
537
# "Set" method, so we fail early here:
797
538
if byte_arrays and signature != "ay":
798
539
raise ValueError("Byte arrays not supported for non-'ay'"
799
" signature {0!r}".format(signature))
540
" signature %r" % signature)
800
541
def decorator(func):
801
542
func._dbus_is_property = True
802
543
func._dbus_interface = dbus_interface
810
551
return decorator
811
552
812
553
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
850
554
class DBusPropertyException(dbus.exceptions.DBusException):
851
555
"""A base class for D-Bus property-related exceptions
852
556
"""
868
572
869
573
class DBusObjectWithProperties(dbus.service.Object):
870
574
"""A D-Bus object with properties.
871
575
872
576
Classes inheriting from this can use the dbus_service_property
873
577
decorator to expose methods as D-Bus properties. It exposes the
874
578
standard Get(), Set(), and GetAll() methods on the D-Bus.
875
579
"""
876
580
877
581
@staticmethod
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)
582
def _is_dbus_property(obj):
583
return getattr(obj, "_dbus_is_property", False)
886
584
887
def _get_all_dbus_things(self, thing):
585
def _get_all_dbus_properties(self):
888
586
"""Returns a generator of (name, attribute) pairs
889
587
"""
890
return ((getattr(athing.__get__(self), "_dbus_name",
891
name),
892
athing.__get__(self))
893
for cls in self.__class__.__mro__
894
for name, athing in
895
inspect.getmembers(cls,
896
self._is_dbus_thing(thing)))
588
return ((prop._dbus_name, prop)
589
for name, prop in
590
inspect.getmembers(self, self._is_dbus_property))
897
591
898
592
def _get_dbus_property(self, interface_name, property_name):
899
593
"""Returns a bound method if one exists which is a D-Bus
900
594
property with the specified name and interface.
901
595
"""
902
for cls in self.__class__.__mro__:
903
for name, value in (inspect.getmembers
904
(cls,
905
self._is_dbus_thing("property"))):
906
if (value._dbus_name == property_name
907
and value._dbus_interface == interface_name):
908
return value.__get__(self)
909
596
for name in (property_name,
597
property_name + "_dbus_property"):
598
prop = getattr(self, name, None)
599
if (prop is None
600
or not self._is_dbus_property(prop)
601
or prop._dbus_name != property_name
602
or (interface_name and prop._dbus_interface
603
and interface_name != prop._dbus_interface)):
604
continue
605
return prop
910
606
# No such property
911
607
raise DBusPropertyNotFound(self.dbus_object_path + ":"
912
608
+ interface_name + "."
936
632
# The byte_arrays option is not supported yet on
937
633
# signatures other than "ay".
938
634
if prop._dbus_signature != "ay":
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))
635
raise ValueError
636
value = dbus.ByteArray(''.join(unichr(byte)
637
for byte in value))
944
638
prop(value)
945
639
946
640
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
948
642
def GetAll(self, interface_name):
949
643
"""Standard D-Bus property GetAll() method, see D-Bus
950
644
standard.
951
645
952
646
Note: Will not include properties with access="write".
953
647
"""
954
properties = {}
955
for name, prop in self._get_all_dbus_things("property"):
648
all = {}
649
for name, prop in self._get_all_dbus_properties():
956
650
if (interface_name
957
651
and interface_name != prop._dbus_interface):
958
652
# Interface non-empty but did not match
962
656
continue
963
657
value = prop()
964
658
if not hasattr(value, "variant_level"):
965
properties[name] = value
659
all[name] = value
966
660
continue
967
properties[name] = type(value)(value, variant_level=
968
value.variant_level+1)
969
return dbus.Dictionary(properties, signature="sv")
661
all[name] = type(value)(value, variant_level=
662
value.variant_level+1)
663
return dbus.Dictionary(all, signature="sv")
970
664
971
665
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
972
666
out_signature="s",
973
667
path_keyword='object_path',
974
668
connection_keyword='connection')
975
669
def Introspect(self, object_path, connection):
976
"""Overloading of standard D-Bus method.
977
978
Inserts property tags and interface annotation tags.
670
"""Standard D-Bus method, overloaded to insert property tags.
979
671
"""
980
672
xmlstring = dbus.service.Object.Introspect(self, object_path,
981
673
connection)
988
680
e.setAttribute("access", prop._dbus_access)
989
681
return e
990
682
for if_tag in document.getElementsByTagName("interface"):
991
# Add property tags
992
683
for tag in (make_tag(document, name, prop)
993
684
for name, prop
994
in self._get_all_dbus_things("property")
685
in self._get_all_dbus_properties()
995
686
if prop._dbus_interface
996
687
== if_tag.getAttribute("name")):
997
688
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)
1029
689
# Add the names to the return values for the
1030
690
# "org.freedesktop.DBus.Properties" methods
1031
691
if (if_tag.getAttribute("name")
1044
704
xmlstring = document.toxml("utf-8")
1045
705
document.unlink()
1046
706
except (AttributeError, xml.dom.DOMException,
1047
xml.parsers.expat.ExpatError) as error:
707
xml.parsers.expat.ExpatError), error:
1048
708
logger.error("Failed to override Introspection method",
1049
exc_info=error)
709
error)
1050
710
return xmlstring
1051
711
1052
712
1053
def datetime_to_dbus(dt, variant_level=0):
1054
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1055
if dt is None:
1056
return dbus.String("", variant_level = variant_level)
1057
return dbus.String(dt.isoformat(),
1058
variant_level=variant_level)
1059
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).
1083
"""
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):
1091
# Ignore non-D-Bus attributes, and D-Bus attributes
1092
# with the wrong interface name
1093
if (not hasattr(attribute, "_dbus_interface")
1094
or not attribute._dbus_interface
1095
.startswith(orig_interface_name)):
1096
continue
1097
# Create an alternate D-Bus interface name based on
1098
# the current name
1099
alt_interface = (attribute._dbus_interface
1100
.replace(orig_interface_name,
1101
alt_interface_name))
1102
interface_names.add(alt_interface)
1103
# Is this a D-Bus signal?
1104
if getattr(attribute, "_dbus_is_signal", False):
1105
# Extract the original non-method undecorated
1106
# function by black magic
1107
nonmethod_func = (dict(
1108
zip(attribute.func_code.co_freevars,
1109
attribute.__closure__))["func"]
1110
.cell_contents)
1111
# Create a new, but exactly alike, function
1112
# object, and decorate it to be a new D-Bus signal
1113
# with the alternate D-Bus interface name
1114
new_function = (dbus.service.signal
1115
(alt_interface,
1116
attribute._dbus_signature)
1117
(types.FunctionType(
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)))
1123
# Copy annotations, if any
1124
try:
1125
new_function._dbus_annotations = (
1126
dict(attribute._dbus_annotations))
1127
except AttributeError:
1128
pass
1129
# Define a creator of a function to call both the
1130
# original and alternate functions, so both the
1131
# original and alternate signals gets sent when
1132
# the function is called
1133
def fixscope(func1, func2):
1134
"""This function is a scope container to pass
1135
func1 and func2 to the "call_both" function
1136
outside of its arguments"""
1137
def call_both(*args, **kwargs):
1138
"""This function will emit two D-Bus
1139
signals by calling func1 and func2"""
1140
func1(*args, **kwargs)
1141
func2(*args, **kwargs)
1142
return call_both
1143
# Create the "call_both" function and add it to
1144
# the class
1145
attr[attrname] = fixscope(attribute, new_function)
1146
# Is this a D-Bus method?
1147
elif getattr(attribute, "_dbus_is_method", False):
1148
# Create a new, but exactly alike, function
1149
# object. Decorate it to be a new D-Bus method
1150
# with the alternate D-Bus interface name. Add it
1151
# to the class.
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)))
1162
# Copy annotations, if any
1163
try:
1164
attr[attrname]._dbus_annotations = (
1165
dict(attribute._dbus_annotations))
1166
except AttributeError:
1167
pass
1168
# Is this a D-Bus property?
1169
elif getattr(attribute, "_dbus_is_property", False):
1170
# Create a new, but exactly alike, function
1171
# object, and decorate it to be a new D-Bus
1172
# property with the alternate D-Bus interface
1173
# name. Add it to the class.
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)))
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"})
1232
713
class ClientDBus(Client, DBusObjectWithProperties):
1233
714
"""A Client class using D-Bus
1234
715
1243
724
# dbus.service.Object doesn't use super(), so we can't either.
1244
725
1245
726
def __init__(self, bus = None, *args, **kwargs):
727
self._approvals_pending = 0
1246
728
self.bus = bus
1247
729
Client.__init__(self, *args, **kwargs)
1248
730
# Only now, when this client is initialized, can it show up on
1254
736
("/clients/" + client_object_name))
1255
737
DBusObjectWithProperties.__init__(self, self.bus,
1256
738
self.dbus_object_path)
1257
1258
def notifychangeproperty(transform_func,
1259
dbus_name, type_func=lambda x: x,
1260
variant_level=1):
1261
""" Modify a variable so that it's a property which announces
1262
its changes to DBus.
1263
1264
transform_fun: Function that takes a value and a variant_level
1265
and transforms it to a D-Bus type.
1266
dbus_name: D-Bus name of the variable
1267
type_func: Function that transform the value before sending it
1268
to the D-Bus. Default: no transform
1269
variant_level: D-Bus variant level. Default: 1
1270
"""
1271
attrname = "_{0}".format(dbus_name)
1272
def setter(self, value):
1273
if hasattr(self, "dbus_object_path"):
1274
if (not hasattr(self, attrname) or
1275
type_func(getattr(self, attrname, None))
1276
!= type_func(value)):
1277
dbus_value = transform_func(type_func(value),
1278
variant_level
1279
=variant_level)
1280
self.PropertyChanged(dbus.String(dbus_name),
1281
dbus_value)
1282
setattr(self, attrname, value)
1283
1284
return property(lambda self: getattr(self, attrname), setter)
1285
1286
expires = notifychangeproperty(datetime_to_dbus, "Expires")
1287
approvals_pending = notifychangeproperty(dbus.Boolean,
1288
"ApprovalPending",
1289
type_func = bool)
1290
enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1291
last_enabled = notifychangeproperty(datetime_to_dbus,
1292
"LastEnabled")
1293
checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
1294
type_func = lambda checker:
1295
checker is not None)
1296
last_checked_ok = notifychangeproperty(datetime_to_dbus,
1297
"LastCheckedOK")
1298
last_checker_status = notifychangeproperty(dbus.Int16,
1299
"LastCheckerStatus")
1300
last_approval_request = notifychangeproperty(
1301
datetime_to_dbus, "LastApprovalRequest")
1302
approved_by_default = notifychangeproperty(dbus.Boolean,
1303
"ApprovedByDefault")
1304
approval_delay = notifychangeproperty(dbus.UInt64,
1305
"ApprovalDelay",
1306
type_func =
1307
timedelta_to_milliseconds)
1308
approval_duration = notifychangeproperty(
1309
dbus.UInt64, "ApprovalDuration",
1310
type_func = timedelta_to_milliseconds)
1311
host = notifychangeproperty(dbus.String, "Host")
1312
timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1313
type_func =
1314
timedelta_to_milliseconds)
1315
extended_timeout = notifychangeproperty(
1316
dbus.UInt64, "ExtendedTimeout",
1317
type_func = timedelta_to_milliseconds)
1318
interval = notifychangeproperty(dbus.UInt64,
1319
"Interval",
1320
type_func =
1321
timedelta_to_milliseconds)
1322
checker_command = notifychangeproperty(dbus.String, "Checker")
1323
1324
del notifychangeproperty
739
740
def _get_approvals_pending(self):
741
return self._approvals_pending
742
def _set_approvals_pending(self, value):
743
old_value = self._approvals_pending
744
self._approvals_pending = value
745
bval = bool(value)
746
if (hasattr(self, "dbus_object_path")
747
and bval is not bool(old_value)):
748
dbus_bool = dbus.Boolean(bval, variant_level=1)
749
self.PropertyChanged(dbus.String("ApprovalPending"),
750
dbus_bool)
751
752
approvals_pending = property(_get_approvals_pending,
753
_set_approvals_pending)
754
del _get_approvals_pending, _set_approvals_pending
755
756
@staticmethod
757
def _datetime_to_dbus(dt, variant_level=0):
758
"""Convert a UTC datetime.datetime() to a D-Bus type."""
759
return dbus.String(dt.isoformat(),
760
variant_level=variant_level)
761
762
def enable(self):
763
oldstate = getattr(self, "enabled", False)
764
r = Client.enable(self)
765
if oldstate != self.enabled:
766
# Emit D-Bus signals
767
self.PropertyChanged(dbus.String("Enabled"),
768
dbus.Boolean(True, variant_level=1))
769
self.PropertyChanged(
770
dbus.String("LastEnabled"),
771
self._datetime_to_dbus(self.last_enabled,
772
variant_level=1))
773
return r
774
775
def disable(self, quiet = False):
776
oldstate = getattr(self, "enabled", False)
777
r = Client.disable(self, quiet=quiet)
778
if not quiet and oldstate != self.enabled:
779
# Emit D-Bus signal
780
self.PropertyChanged(dbus.String("Enabled"),
781
dbus.Boolean(False, variant_level=1))
782
return r
1325
783
1326
784
def __del__(self, *args, **kwargs):
1327
785
try:
1336
794
*args, **kwargs):
1337
795
self.checker_callback_tag = None
1338
796
self.checker = None
797
# Emit D-Bus signal
798
self.PropertyChanged(dbus.String("CheckerRunning"),
799
dbus.Boolean(False, variant_level=1))
1339
800
if os.WIFEXITED(condition):
1340
801
exitstatus = os.WEXITSTATUS(condition)
1341
802
# Emit D-Bus signal
1351
812
return Client.checker_callback(self, pid, condition, command,
1352
813
*args, **kwargs)
1353
814
815
def checked_ok(self, *args, **kwargs):
816
r = Client.checked_ok(self, *args, **kwargs)
817
# Emit D-Bus signal
818
self.PropertyChanged(
819
dbus.String("LastCheckedOK"),
820
(self._datetime_to_dbus(self.last_checked_ok,
821
variant_level=1)))
822
return r
823
824
def need_approval(self, *args, **kwargs):
825
r = Client.need_approval(self, *args, **kwargs)
826
# Emit D-Bus signal
827
self.PropertyChanged(
828
dbus.String("LastApprovalRequest"),
829
(self._datetime_to_dbus(self.last_approval_request,
830
variant_level=1)))
831
return r
832
1354
833
def start_checker(self, *args, **kwargs):
1355
old_checker_pid = getattr(self.checker, "pid", None)
834
old_checker = self.checker
835
if self.checker is not None:
836
old_checker_pid = self.checker.pid
837
else:
838
old_checker_pid = None
1356
839
r = Client.start_checker(self, *args, **kwargs)
1357
840
# Only if new checker process was started
1358
841
if (self.checker is not None
1359
842
and old_checker_pid != self.checker.pid):
1360
843
# Emit D-Bus signal
1361
844
self.CheckerStarted(self.current_checker_command)
845
self.PropertyChanged(
846
dbus.String("CheckerRunning"),
847
dbus.Boolean(True, variant_level=1))
1362
848
return r
1363
849
850
def stop_checker(self, *args, **kwargs):
851
old_checker = getattr(self, "checker", None)
852
r = Client.stop_checker(self, *args, **kwargs)
853
if (old_checker is not None
854
and getattr(self, "checker", None) is None):
855
self.PropertyChanged(dbus.String("CheckerRunning"),
856
dbus.Boolean(False, variant_level=1))
857
return r
858
1364
859
def _reset_approved(self):
1365
self.approved = None
860
self._approved = None
1366
861
return False
1367
862
1368
863
def approve(self, value=True):
1369
self.approved = value
1370
gobject.timeout_add(timedelta_to_milliseconds
864
self.send_changedstate()
865
self._approved = value
866
gobject.timeout_add(self._timedelta_to_milliseconds
1371
867
(self.approval_duration),
1372
868
self._reset_approved)
1373
self.send_changedstate()
869
1374
870
1375
871
## D-Bus methods, signals & properties
1376
_interface = "se.recompile.Mandos.Client"
1377
1378
## Interfaces
1379
1380
@dbus_interface_annotations(_interface)
1381
def _foo(self):
1382
return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
1383
"false"}
872
_interface = "se.bsnet.fukt.Mandos.Client"
1384
873
1385
874
## Signals
1386
875
1433
922
# CheckedOK - method
1434
923
@dbus.service.method(_interface)
1435
924
def CheckedOK(self):
1436
self.checked_ok()
925
return self.checked_ok()
1437
926
1438
927
# Enable - method
1439
928
@dbus.service.method(_interface)
1472
961
if value is None: # get
1473
962
return dbus.Boolean(self.approved_by_default)
1474
963
self.approved_by_default = bool(value)
964
# Emit D-Bus signal
965
self.PropertyChanged(dbus.String("ApprovedByDefault"),
966
dbus.Boolean(value, variant_level=1))
1475
967
1476
968
# ApprovalDelay - property
1477
969
@dbus_service_property(_interface, signature="t",
1480
972
if value is None: # get
1481
973
return dbus.UInt64(self.approval_delay_milliseconds())
1482
974
self.approval_delay = datetime.timedelta(0, 0, 0, value)
975
# Emit D-Bus signal
976
self.PropertyChanged(dbus.String("ApprovalDelay"),
977
dbus.UInt64(value, variant_level=1))
1483
978
1484
979
# ApprovalDuration - property
1485
980
@dbus_service_property(_interface, signature="t",
1486
981
access="readwrite")
1487
982
def ApprovalDuration_dbus_property(self, value=None):
1488
983
if value is None: # get
1489
return dbus.UInt64(timedelta_to_milliseconds(
984
return dbus.UInt64(self._timedelta_to_milliseconds(
1490
985
self.approval_duration))
1491
986
self.approval_duration = datetime.timedelta(0, 0, 0, value)
987
# Emit D-Bus signal
988
self.PropertyChanged(dbus.String("ApprovalDuration"),
989
dbus.UInt64(value, variant_level=1))
1492
990
1493
991
# Name - property
1494
992
@dbus_service_property(_interface, signature="s", access="read")
1506
1004
def Host_dbus_property(self, value=None):
1507
1005
if value is None: # get
1508
1006
return dbus.String(self.host)
1509
self.host = unicode(value)
1007
self.host = value
1008
# Emit D-Bus signal
1009
self.PropertyChanged(dbus.String("Host"),
1010
dbus.String(value, variant_level=1))
1510
1011
1511
1012
# Created - property
1512
1013
@dbus_service_property(_interface, signature="s", access="read")
1513
1014
def Created_dbus_property(self):
1514
return datetime_to_dbus(self.created)
1015
return dbus.String(self._datetime_to_dbus(self.created))
1515
1016
1516
1017
# LastEnabled - property
1517
1018
@dbus_service_property(_interface, signature="s", access="read")
1518
1019
def LastEnabled_dbus_property(self):
1519
return datetime_to_dbus(self.last_enabled)
1020
if self.last_enabled is None:
1021
return dbus.String("")
1022
return dbus.String(self._datetime_to_dbus(self.last_enabled))
1520
1023
1521
1024
# Enabled - property
1522
1025
@dbus_service_property(_interface, signature="b",
1536
1039
if value is not None:
1537
1040
self.checked_ok()
1538
1041
return
1539
return datetime_to_dbus(self.last_checked_ok)
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
1547
# Expires - property
1548
@dbus_service_property(_interface, signature="s", access="read")
1549
def Expires_dbus_property(self):
1550
return datetime_to_dbus(self.expires)
1042
if self.last_checked_ok is None:
1043
return dbus.String("")
1044
return dbus.String(self._datetime_to_dbus(self
1045
.last_checked_ok))
1551
1046
1552
1047
# LastApprovalRequest - property
1553
1048
@dbus_service_property(_interface, signature="s", access="read")
1554
1049
def LastApprovalRequest_dbus_property(self):
1555
return datetime_to_dbus(self.last_approval_request)
1050
if self.last_approval_request is None:
1051
return dbus.String("")
1052
return dbus.String(self.
1053
_datetime_to_dbus(self
1054
.last_approval_request))
1556
1055
1557
1056
# Timeout - property
1558
1057
@dbus_service_property(_interface, signature="t",
1560
1059
def Timeout_dbus_property(self, value=None):
1561
1060
if value is None: # get
1562
1061
return dbus.UInt64(self.timeout_milliseconds())
1563
old_timeout = self.timeout
1564
1062
self.timeout = datetime.timedelta(0, 0, 0, value)
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))
1581
1582
# ExtendedTimeout - property
1583
@dbus_service_property(_interface, signature="t",
1584
access="readwrite")
1585
def ExtendedTimeout_dbus_property(self, value=None):
1586
if value is None: # get
1587
return dbus.UInt64(self.extended_timeout_milliseconds())
1588
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1063
# Emit D-Bus signal
1064
self.PropertyChanged(dbus.String("Timeout"),
1065
dbus.UInt64(value, variant_level=1))
1066
if getattr(self, "disable_initiator_tag", None) is None:
1067
return
1068
# Reschedule timeout
1069
gobject.source_remove(self.disable_initiator_tag)
1070
self.disable_initiator_tag = None
1071
time_to_die = (self.
1072
_timedelta_to_milliseconds((self
1073
.last_checked_ok
1074
+ self.timeout)
1075
- datetime.datetime
1076
.utcnow()))
1077
if time_to_die <= 0:
1078
# The timeout has passed
1079
self.disable()
1080
else:
1081
self.disable_initiator_tag = (gobject.timeout_add
1082
(time_to_die, self.disable))
1589
1083
1590
1084
# Interval - property
1591
1085
@dbus_service_property(_interface, signature="t",
1594
1088
if value is None: # get
1595
1089
return dbus.UInt64(self.interval_milliseconds())
1596
1090
self.interval = datetime.timedelta(0, 0, 0, value)
1091
# Emit D-Bus signal
1092
self.PropertyChanged(dbus.String("Interval"),
1093
dbus.UInt64(value, variant_level=1))
1597
1094
if getattr(self, "checker_initiator_tag", None) is None:
1598
1095
return
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
1605
1096
# Reschedule checker run
1097
gobject.source_remove(self.checker_initiator_tag)
1098
self.checker_initiator_tag = (gobject.timeout_add
1099
(value, self.start_checker))
1100
self.start_checker() # Start one now, too
1101
1606
1102
# Checker - property
1607
1103
@dbus_service_property(_interface, signature="s",
1608
1104
access="readwrite")
1609
1105
def Checker_dbus_property(self, value=None):
1610
1106
if value is None: # get
1611
1107
return dbus.String(self.checker_command)
1612
self.checker_command = unicode(value)
1108
self.checker_command = value
1109
# Emit D-Bus signal
1110
self.PropertyChanged(dbus.String("Checker"),
1111
dbus.String(self.checker_command,
1112
variant_level=1))
1613
1113
1614
1114
# CheckerRunning - property
1615
1115
@dbus_service_property(_interface, signature="b",
1642
1142
self._pipe.send(('init', fpr, address))
1643
1143
if not self._pipe.recv():
1644
1144
raise KeyError()
1645
1145
1646
1146
def __getattribute__(self, name):
1647
if name == '_pipe':
1147
if(name == '_pipe'):
1648
1148
return super(ProxyClient, self).__getattribute__(name)
1649
1149
self._pipe.send(('getattr', name))
1650
1150
data = self._pipe.recv()
1655
1155
self._pipe.send(('funcall', name, args, kwargs))
1656
1156
return self._pipe.recv()[1]
1657
1157
return func
1658
1158
1659
1159
def __setattr__(self, name, value):
1660
if name == '_pipe':
1160
if(name == '_pipe'):
1661
1161
return super(ProxyClient, self).__setattr__(name, value)
1662
1162
self._pipe.send(('setattr', name, value))
1663
1163
1674
1174
unicode(self.client_address))
1675
1175
logger.debug("Pipe FD: %d",
1676
1176
self.server.child_pipe.fileno())
1677
1177
1678
1178
session = (gnutls.connection
1679
1179
.ClientSession(self.request,
1680
1180
gnutls.connection
1681
1181
.X509Credentials()))
1682
1182
1683
1183
# Note: gnutls.connection.X509Credentials is really a
1684
1184
# generic GnuTLS certificate credentials object so long as
1685
1185
# no X.509 keys are added to it. Therefore, we can use it
1686
1186
# here despite using OpenPGP certificates.
1687
1187
1688
1188
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1689
1189
# "+AES-256-CBC", "+SHA1",
1690
1190
# "+COMP-NULL", "+CTYPE-OPENPGP",
1696
1196
(gnutls.library.functions
1697
1197
.gnutls_priority_set_direct(session._c_object,
1698
1198
priority, None))
1699
1199
1700
1200
# Start communication using the Mandos protocol
1701
1201
# Get protocol number
1702
1202
line = self.request.makefile().readline()
1703
1203
logger.debug("Protocol version: %r", line)
1704
1204
try:
1705
1205
if int(line.strip().split()[0]) > 1:
1706
raise RuntimeError(line)
1707
except (ValueError, IndexError, RuntimeError) as error:
1206
raise RuntimeError
1207
except (ValueError, IndexError, RuntimeError), error:
1708
1208
logger.error("Unknown protocol version: %s", error)
1709
1209
return
1710
1210
1711
1211
# Start GnuTLS connection
1712
1212
try:
1713
1213
session.handshake()
1714
except gnutls.errors.GNUTLSError as error:
1214
except gnutls.errors.GNUTLSError, error:
1715
1215
logger.warning("Handshake failed: %s", error)
1716
1216
# Do not run session.bye() here: the session is not
1717
1217
# established. Just abandon the request.
1718
1218
return
1719
1219
logger.debug("Handshake succeeded")
1720
1220
1721
1221
approval_required = False
1722
1222
try:
1723
1223
try:
1724
1224
fpr = self.fingerprint(self.peer_certificate
1725
1225
(session))
1726
except (TypeError,
1727
gnutls.errors.GNUTLSError) as error:
1226
except (TypeError, gnutls.errors.GNUTLSError), error:
1728
1227
logger.warning("Bad certificate: %s", error)
1729
1228
return
1730
1229
logger.debug("Fingerprint: %s", fpr)
1731
1230
1732
1231
try:
1733
1232
client = ProxyClient(child_pipe, fpr,
1734
1233
self.client_address)
1742
1241
1743
1242
while True:
1744
1243
if not client.enabled:
1745
logger.info("Client %s is disabled",
1244
logger.warning("Client %s is disabled",
1746
1245
client.name)
1747
1246
if self.server.use_dbus:
1748
1247
# Emit D-Bus signal
1749
client.Rejected("Disabled")
1248
client.Rejected("Disabled")
1750
1249
return
1751
1250
1752
if client.approved or not client.approval_delay:
1251
if client._approved or not client.approval_delay:
1753
1252
#We are approved or approval is disabled
1754
1253
break
1755
elif client.approved is None:
1254
elif client._approved is None:
1756
1255
logger.info("Client %s needs approval",
1757
1256
client.name)
1758
1257
if self.server.use_dbus:
1769
1268
return
1770
1269
1771
1270
#wait until timeout or approved
1271
#x = float(client._timedelta_to_milliseconds(delay))
1772
1272
time = datetime.datetime.now()
1773
1273
client.changedstate.acquire()
1774
client.changedstate.wait(
1775
float(timedelta_to_milliseconds(delay)
1776
/ 1000))
1274
client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
1777
1275
client.changedstate.release()
1778
1276
time2 = datetime.datetime.now()
1779
1277
if (time2 - time) >= delay:
1794
1292
while sent_size < len(client.secret):
1795
1293
try:
1796
1294
sent = session.send(client.secret[sent_size:])
1797
except gnutls.errors.GNUTLSError as error:
1798
logger.warning("gnutls send failed",
1799
exc_info=error)
1295
except (gnutls.errors.GNUTLSError), error:
1296
logger.warning("gnutls send failed")
1800
1297
return
1801
1298
logger.debug("Sent: %d, remaining: %d",
1802
1299
sent, len(client.secret)
1803
1300
- (sent_size + sent))
1804
1301
sent_size += sent
1805
1302
1806
1303
logger.info("Sending secret to %s", client.name)
1807
# bump the timeout using extended_timeout
1808
client.bump_timeout(client.extended_timeout)
1304
# bump the timeout as if seen
1305
client.checked_ok()
1809
1306
if self.server.use_dbus:
1810
1307
# Emit D-Bus signal
1811
1308
client.GotSecret()
1815
1312
client.approvals_pending -= 1
1816
1313
try:
1817
1314
session.bye()
1818
except gnutls.errors.GNUTLSError as error:
1819
logger.warning("GnuTLS bye failed",
1820
exc_info=error)
1315
except (gnutls.errors.GNUTLSError), error:
1316
logger.warning("GnuTLS bye failed")
1821
1317
1822
1318
@staticmethod
1823
1319
def peer_certificate(session):
1879
1375
# Convert the buffer to a Python bytestring
1880
1376
fpr = ctypes.string_at(buf, buf_len.value)
1881
1377
# Convert the bytestring to hexadecimal notation
1882
hex_fpr = binascii.hexlify(fpr).upper()
1378
hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
1883
1379
return hex_fpr
1884
1380
1885
1381
1888
1384
def sub_process_main(self, request, address):
1889
1385
try:
1890
1386
self.finish_request(request, address)
1891
except Exception:
1387
except:
1892
1388
self.handle_error(request, address)
1893
1389
self.close_request(request)
1894
1390
1895
1391
def process_request(self, request, address):
1896
1392
"""Start a new process to process the request."""
1897
proc = multiprocessing.Process(target = self.sub_process_main,
1898
args = (request, address))
1899
proc.start()
1900
return proc
1901
1393
multiprocessing.Process(target = self.sub_process_main,
1394
args = (request, address)).start()
1902
1395
1903
1396
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1904
1397
""" adds a pipe to the MixIn """
1908
1401
This function creates a new pipe in self.pipe
1909
1402
"""
1910
1403
parent_pipe, self.child_pipe = multiprocessing.Pipe()
1911
1912
proc = MultiprocessingMixIn.process_request(self, request,
1913
client_address)
1404
1405
super(MultiprocessingMixInWithPipe,
1406
self).process_request(request, client_address)
1914
1407
self.child_pipe.close()
1915
self.add_pipe(parent_pipe, proc)
1916
1917
def add_pipe(self, parent_pipe, proc):
1408
self.add_pipe(parent_pipe)
1409
1410
def add_pipe(self, parent_pipe):
1918
1411
"""Dummy function; override as necessary"""
1919
raise NotImplementedError()
1920
1412
raise NotImplementedError
1921
1413
1922
1414
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1923
1415
socketserver.TCPServer, object):
1929
1421
use_ipv6: Boolean; to use IPv6 or not
1930
1422
"""
1931
1423
def __init__(self, server_address, RequestHandlerClass,
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
"""
1424
interface=None, use_ipv6=True):
1936
1425
self.interface = interface
1937
1426
if use_ipv6:
1938
1427
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.
1965
1428
socketserver.TCPServer.__init__(self, server_address,
1966
1429
RequestHandlerClass)
1967
1968
1430
def server_bind(self):
1969
1431
"""This overrides the normal server_bind() function
1970
1432
to bind to an interface if one was specified, and also NOT to
1978
1440
try:
1979
1441
self.socket.setsockopt(socket.SOL_SOCKET,
1980
1442
SO_BINDTODEVICE,
1981
str(self.interface + '\0'))
1982
except socket.error as error:
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:
1443
str(self.interface
1444
+ '\0'))
1445
except socket.error, error:
1446
if error[0] == errno.EPERM:
1447
logger.error("No permission to"
1448
" bind to interface %s",
1449
self.interface)
1450
elif error[0] == errno.ENOPROTOOPT:
1987
1451
logger.error("SO_BINDTODEVICE not available;"
1988
1452
" cannot bind to interface %s",
1989
1453
self.interface)
1990
elif error.errno == errno.ENODEV:
1991
logger.error("Interface %s does not exist,"
1992
" cannot bind", self.interface)
1993
1454
else:
1994
1455
raise
1995
1456
# Only bind(2) the socket if we really need to.
1998
1459
if self.address_family == socket.AF_INET6:
1999
1460
any_address = "::" # in6addr_any
2000
1461
else:
2001
any_address = "0.0.0.0" # INADDR_ANY
1462
any_address = socket.INADDR_ANY
2002
1463
self.server_address = (any_address,
2003
1464
self.server_address[1])
2004
1465
elif not self.server_address[1]:
2025
1486
"""
2026
1487
def __init__(self, server_address, RequestHandlerClass,
2027
1488
interface=None, use_ipv6=True, clients=None,
2028
gnutls_priority=None, use_dbus=True, socketfd=None):
1489
gnutls_priority=None, use_dbus=True):
2029
1490
self.enabled = False
2030
1491
self.clients = clients
2031
1492
if self.clients is None:
2032
self.clients = {}
1493
self.clients = set()
2033
1494
self.use_dbus = use_dbus
2034
1495
self.gnutls_priority = gnutls_priority
2035
1496
IPv6_TCPServer.__init__(self, server_address,
2036
1497
RequestHandlerClass,
2037
1498
interface = interface,
2038
use_ipv6 = use_ipv6,
2039
socketfd = socketfd)
1499
use_ipv6 = use_ipv6)
2040
1500
def server_activate(self):
2041
1501
if self.enabled:
2042
1502
return socketserver.TCPServer.server_activate(self)
2043
2044
1503
def enable(self):
2045
1504
self.enabled = True
2046
2047
def add_pipe(self, parent_pipe, proc):
1505
def add_pipe(self, parent_pipe):
2048
1506
# Call "handle_ipc" for both data and EOF events
2049
1507
gobject.io_add_watch(parent_pipe.fileno(),
2050
1508
gobject.IO_IN | gobject.IO_HUP,
2051
1509
functools.partial(self.handle_ipc,
2052
parent_pipe =
2053
parent_pipe,
2054
proc = proc))
2055
1510
parent_pipe = parent_pipe))
1511
2056
1512
def handle_ipc(self, source, condition, parent_pipe=None,
2057
proc = None, client_object=None):
2058
# error, or the other end of multiprocessing.Pipe has closed
2059
if condition & (gobject.IO_ERR | gobject.IO_HUP):
2060
# Wait for other process to exit
2061
proc.join()
1513
client_object=None):
1514
condition_names = {
1515
gobject.IO_IN: "IN", # There is data to read.
1516
gobject.IO_OUT: "OUT", # Data can be written (without
1517
# blocking).
1518
gobject.IO_PRI: "PRI", # There is urgent data to read.
1519
gobject.IO_ERR: "ERR", # Error condition.
1520
gobject.IO_HUP: "HUP" # Hung up (the connection has been
1521
# broken, usually for pipes and
1522
# sockets).
1523
}
1524
conditions_string = ' | '.join(name
1525
for cond, name in
1526
condition_names.iteritems()
1527
if cond & condition)
1528
# error or the other end of multiprocessing.Pipe has closed
1529
if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
2062
1530
return False
2063
1531
2064
1532
# Read a request from the child
2069
1537
fpr = request[1]
2070
1538
address = request[2]
2071
1539
2072
for c in self.clients.itervalues():
1540
for c in self.clients:
2073
1541
if c.fingerprint == fpr:
2074
1542
client = c
2075
1543
break
2076
1544
else:
2077
logger.info("Client not found for fingerprint: %s, ad"
2078
"dress: %s", fpr, address)
1545
logger.warning("Client not found for fingerprint: %s, ad"
1546
"dress: %s", fpr, address)
2079
1547
if self.use_dbus:
2080
1548
# Emit D-Bus signal
2081
mandos_dbus_service.ClientNotFound(fpr,
2082
address[0])
1549
mandos_dbus_service.ClientNotFound(fpr, address[0])
2083
1550
parent_pipe.send(False)
2084
1551
return False
2085
1552
2086
1553
gobject.io_add_watch(parent_pipe.fileno(),
2087
1554
gobject.IO_IN | gobject.IO_HUP,
2088
1555
functools.partial(self.handle_ipc,
2089
parent_pipe =
2090
parent_pipe,
2091
proc = proc,
2092
client_object =
2093
client))
1556
parent_pipe = parent_pipe,
1557
client_object = client))
2094
1558
parent_pipe.send(True)
2095
# remove the old hook in favor of the new above hook on
2096
# same fileno
1559
# remove the old hook in favor of the new above hook on same fileno
2097
1560
return False
2098
1561
if command == 'funcall':
2099
1562
funcname = request[1]
2100
1563
args = request[2]
2101
1564
kwargs = request[3]
2102
1565
2103
parent_pipe.send(('data', getattr(client_object,
2104
funcname)(*args,
2105
**kwargs)))
2106
1566
parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
1567
2107
1568
if command == 'getattr':
2108
1569
attrname = request[1]
2109
1570
if callable(client_object.__getattribute__(attrname)):
2110
1571
parent_pipe.send(('function',))
2111
1572
else:
2112
parent_pipe.send(('data', client_object
2113
.__getattribute__(attrname)))
1573
parent_pipe.send(('data', client_object.__getattribute__(attrname)))
2114
1574
2115
1575
if command == 'setattr':
2116
1576
attrname = request[1]
2117
1577
value = request[2]
2118
1578
setattr(client_object, attrname, value)
2119
1579
2120
1580
return True
2121
1581
2122
1582
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
2222
1583
def string_to_delta(interval):
2223
1584
"""Parse a string and return a datetime.timedelta
2224
1585
2235
1596
>>> string_to_delta('5m 30s')
2236
1597
datetime.timedelta(0, 330)
2237
1598
"""
2238
2239
try:
2240
return rfc3339_duration_to_delta(interval)
2241
except ValueError:
2242
pass
2243
2244
1599
timevalue = datetime.timedelta(0)
2245
1600
for s in interval.split():
2246
1601
try:
2257
1612
elif suffix == "w":
2258
1613
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2259
1614
else:
2260
raise ValueError("Unknown suffix {0!r}"
2261
.format(suffix))
2262
except IndexError as e:
1615
raise ValueError("Unknown suffix %r" % suffix)
1616
except (ValueError, IndexError), e:
2263
1617
raise ValueError(*(e.args))
2264
1618
timevalue += delta
2265
1619
return timevalue
2266
1620
2267
1621
1622
def if_nametoindex(interface):
1623
"""Call the C function if_nametoindex(), or equivalent
1624
1625
Note: This function cannot accept a unicode string."""
1626
global if_nametoindex
1627
try:
1628
if_nametoindex = (ctypes.cdll.LoadLibrary
1629
(ctypes.util.find_library("c"))
1630
.if_nametoindex)
1631
except (OSError, AttributeError):
1632
logger.warning("Doing if_nametoindex the hard way")
1633
def if_nametoindex(interface):
1634
"Get an interface index the hard way, i.e. using fcntl()"
1635
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
1636
with contextlib.closing(socket.socket()) as s:
1637
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1638
struct.pack(str("16s16x"),
1639
interface))
1640
interface_index = struct.unpack(str("I"),
1641
ifreq[16:20])[0]
1642
return interface_index
1643
return if_nametoindex(interface)
1644
1645
2268
1646
def daemon(nochdir = False, noclose = False):
2269
1647
"""See daemon(3). Standard BSD Unix function.
2270
1648
2278
1656
sys.exit()
2279
1657
if not noclose:
2280
1658
# Close all standard open file descriptors
2281
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
1659
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2282
1660
if not stat.S_ISCHR(os.fstat(null).st_mode):
2283
1661
raise OSError(errno.ENODEV,
2284
"{0} not a character device"
2285
.format(os.devnull))
1662
"%s not a character device"
1663
% os.path.devnull)
2286
1664
os.dup2(null, sys.stdin.fileno())
2287
1665
os.dup2(null, sys.stdout.fileno())
2288
1666
os.dup2(null, sys.stderr.fileno())
2297
1675
2298
1676
parser = argparse.ArgumentParser()
2299
1677
parser.add_argument("-v", "--version", action="version",
2300
version = "%(prog)s {0}".format(version),
1678
version = "%%(prog)s %s" % version,
2301
1679
help="show version number and exit")
2302
1680
parser.add_argument("-i", "--interface", metavar="IF",
2303
1681
help="Bind to interface IF")
2309
1687
help="Run self-test")
2310
1688
parser.add_argument("--debug", action="store_true",
2311
1689
help="Debug mode; run in foreground and log"
2312
" to terminal", default=None)
1690
" to terminal")
2313
1691
parser.add_argument("--debuglevel", metavar="LEVEL",
2314
1692
help="Debug level for stdout output")
2315
1693
parser.add_argument("--priority", help="GnuTLS"
2322
1700
" files")
2323
1701
parser.add_argument("--no-dbus", action="store_false",
2324
1702
dest="use_dbus", help="Do not provide D-Bus"
2325
" system bus interface", default=None)
1703
" system bus interface")
2326
1704
parser.add_argument("--no-ipv6", action="store_false",
2327
dest="use_ipv6", help="Do not use IPv6",
2328
default=None)
2329
parser.add_argument("--no-restore", action="store_false",
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
1705
dest="use_ipv6", help="Do not use IPv6")
2340
1706
options = parser.parse_args()
2341
1707
2342
1708
if options.check:
2343
1709
import doctest
2344
fail_count, test_count = doctest.testmod()
2345
sys.exit(os.EX_OK if fail_count == 0 else 1)
1710
doctest.testmod()
1711
sys.exit()
2346
1712
2347
1713
# Default values for config file for server-global settings
2348
1714
server_defaults = { "interface": "",
2350
1716
"port": "",
2351
1717
"debug": "False",
2352
1718
"priority":
2353
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:+SIGN-RSA-SHA224:+SIGN-RSA-RMD160",
1719
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
2354
1720
"servicename": "Mandos",
2355
1721
"use_dbus": "True",
2356
1722
"use_ipv6": "True",
2357
1723
"debuglevel": "",
2358
"restore": "True",
2359
"socket": "",
2360
"statedir": "/var/lib/mandos",
2361
"foreground": "False",
2362
1724
}
2363
1725
2364
1726
# Parse config file for server-global settings
2369
1731
# Convert the SafeConfigParser object to a dict
2370
1732
server_settings = server_config.defaults()
2371
1733
# Use the appropriate methods on the non-string config options
2372
for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
1734
for option in ("debug", "use_dbus", "use_ipv6"):
2373
1735
server_settings[option] = server_config.getboolean("DEFAULT",
2374
1736
option)
2375
1737
if server_settings["port"]:
2376
1738
server_settings["port"] = server_config.getint("DEFAULT",
2377
1739
"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"])
2387
1740
del server_config
2388
1741
2389
1742
# Override the settings from the config file with command line
2390
1743
# options, if set.
2391
1744
for option in ("interface", "address", "port", "debug",
2392
1745
"priority", "servicename", "configdir",
2393
"use_dbus", "use_ipv6", "debuglevel", "restore",
2394
"statedir", "socket", "foreground"):
1746
"use_dbus", "use_ipv6", "debuglevel"):
2395
1747
value = getattr(options, option)
2396
1748
if value is not None:
2397
1749
server_settings[option] = value
2400
1752
for option in server_settings.keys():
2401
1753
if type(server_settings[option]) is str:
2402
1754
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
2410
1755
# Now we have our good server settings in "server_settings"
2411
1756
2412
1757
##################################################################
2416
1761
debuglevel = server_settings["debuglevel"]
2417
1762
use_dbus = server_settings["use_dbus"]
2418
1763
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)
2431
1764
2432
1765
if server_settings["servicename"] != "Mandos":
2433
1766
syslogger.setFormatter(logging.Formatter
2434
('Mandos ({0}) [%(process)d]:'
2435
' %(levelname)s: %(message)s'
2436
.format(server_settings
2437
["servicename"])))
1767
('Mandos (%s) [%%(process)d]:'
1768
' %%(levelname)s: %%(message)s'
1769
% server_settings["servicename"]))
2438
1770
2439
1771
# Parse config file with clients
2440
client_config = configparser.SafeConfigParser(Client
2441
.client_defaults)
1772
client_defaults = { "timeout": "1h",
1773
"interval": "5m",
1774
"checker": "fping -q -- %%(host)s",
1775
"host": "",
1776
"approval_delay": "0s",
1777
"approval_duration": "1s",
1778
}
1779
client_config = configparser.SafeConfigParser(client_defaults)
2442
1780
client_config.read(os.path.join(server_settings["configdir"],
2443
1781
"clients.conf"))
2444
1782
2453
1791
use_ipv6=use_ipv6,
2454
1792
gnutls_priority=
2455
1793
server_settings["priority"],
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
1794
use_dbus=use_dbus)
1795
if not debug:
1796
pidfilename = "/var/run/mandos.pid"
2464
1797
try:
2465
1798
pidfile = open(pidfilename, "w")
2466
except IOError as e:
2467
logger.error("Could not open file %r", pidfilename,
2468
exc_info=e)
1799
except IOError:
1800
logger.error("Could not open file %r", pidfilename)
2469
1801
2470
for name in ("_mandos", "mandos", "nobody"):
1802
try:
1803
uid = pwd.getpwnam("_mandos").pw_uid
1804
gid = pwd.getpwnam("_mandos").pw_gid
1805
except KeyError:
2471
1806
try:
2472
uid = pwd.getpwnam(name).pw_uid
2473
gid = pwd.getpwnam(name).pw_gid
2474
break
1807
uid = pwd.getpwnam("mandos").pw_uid
1808
gid = pwd.getpwnam("mandos").pw_gid
2475
1809
except KeyError:
2476
continue
2477
else:
2478
uid = 65534
2479
gid = 65534
1810
try:
1811
uid = pwd.getpwnam("nobody").pw_uid
1812
gid = pwd.getpwnam("nobody").pw_gid
1813
except KeyError:
1814
uid = 65534
1815
gid = 65534
2480
1816
try:
2481
1817
os.setgid(gid)
2482
1818
os.setuid(uid)
2483
except OSError as error:
2484
if error.errno != errno.EPERM:
2485
raise
1819
except OSError, error:
1820
if error[0] != errno.EPERM:
1821
raise error
2486
1822
1823
if not debug and not debuglevel:
1824
syslogger.setLevel(logging.WARNING)
1825
console.setLevel(logging.WARNING)
1826
if debuglevel:
1827
level = getattr(logging, debuglevel.upper())
1828
syslogger.setLevel(level)
1829
console.setLevel(level)
1830
2487
1831
if debug:
2488
1832
# Enable all possible GnuTLS debugging
2489
1833
2499
1843
.gnutls_global_set_log_function(debug_gnutls))
2500
1844
2501
1845
# Redirect stdin so all checkers get /dev/null
2502
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
1846
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2503
1847
os.dup2(null, sys.stdin.fileno())
2504
1848
if null > 2:
2505
1849
os.close(null)
1850
else:
1851
# No console logging
1852
logger.removeHandler(console)
2506
1853
2507
1854
# Need to fork before connecting to D-Bus
2508
if not foreground:
1855
if not debug:
2509
1856
# Close all input and output, do double fork, etc.
2510
1857
daemon()
2511
1858
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
2516
1859
global main_loop
2517
1860
# From the Avahi example code
2518
DBusGMainLoop(set_as_default=True)
1861
DBusGMainLoop(set_as_default=True )
2519
1862
main_loop = gobject.MainLoop()
2520
1863
bus = dbus.SystemBus()
2521
1864
# End of Avahi example code
2522
1865
if use_dbus:
2523
1866
try:
2524
bus_name = dbus.service.BusName("se.recompile.Mandos",
1867
bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
2525
1868
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:
2530
logger.error("Disabling D-Bus:", exc_info=e)
1869
except dbus.exceptions.NameExistsException, e:
1870
logger.error(unicode(e) + ", disabling D-Bus")
2531
1871
use_dbus = False
2532
1872
server_settings["use_dbus"] = False
2533
1873
tcp_server.use_dbus = False
2534
1874
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)
1875
service = AvahiService(name = server_settings["servicename"],
1876
servicetype = "_mandos._tcp",
1877
protocol = protocol, bus = bus)
2539
1878
if server_settings["interface"]:
2540
1879
service.interface = (if_nametoindex
2541
1880
(str(server_settings["interface"])))
2546
1885
client_class = Client
2547
1886
if use_dbus:
2548
1887
client_class = functools.partial(ClientDBus, bus = bus)
2549
2550
client_settings = Client.config_parser(client_config)
2551
old_client_settings = {}
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.
2563
if server_settings["restore"]:
2564
try:
2565
with open(stored_state_path, "rb") as stored_state:
2566
clients_data, old_client_settings = (pickle.load
2567
(stored_state))
2568
os.remove(stored_state_path)
2569
except IOError as e:
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)
2576
raise
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))
1888
def client_config_items(config, section):
1889
special_settings = {
1890
"approved_by_default":
1891
lambda: config.getboolean(section,
1892
"approved_by_default"),
1893
}
1894
for name, value in config.items(section):
2631
1895
try:
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)
2656
1896
yield (name, special_settings[name]())
1897
except KeyError:
1898
yield (name, value)
1899
1900
tcp_server.clients.update(set(
1901
client_class(name = section,
1902
config= dict(client_config_items(
1903
client_config, section)))
1904
for section in client_config.sections()))
2657
1905
if not tcp_server.clients:
2658
1906
logger.warning("No clients defined")
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
1907
1908
if not debug:
1909
try:
1910
with pidfile:
1911
pid = os.getpid()
1912
pidfile.write(str(pid) + "\n".encode("utf-8"))
1913
del pidfile
1914
except IOError:
1915
logger.error("Could not write to file %r with PID %d",
1916
pidfilename, pid)
1917
except NameError:
1918
# "pidfile" was never created
1919
pass
2670
1920
del pidfilename
2671
1921
1922
signal.signal(signal.SIGINT, signal.SIG_IGN)
1923
2672
1924
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2673
1925
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2674
1926
2675
1927
if use_dbus:
2676
@alternate_dbus_interfaces({"se.recompile.Mandos":
2677
"se.bsnet.fukt.Mandos"})
2678
class MandosDBusService(DBusObjectWithProperties):
1928
class MandosDBusService(dbus.service.Object):
2679
1929
"""A D-Bus proxy object"""
2680
1930
def __init__(self):
2681
1931
dbus.service.Object.__init__(self, bus, "/")
2682
_interface = "se.recompile.Mandos"
2683
2684
@dbus_interface_annotations(_interface)
2685
def _foo(self):
2686
return { "org.freedesktop.DBus.Property"
2687
".EmitsChangedSignal":
2688
"false"}
1932
_interface = "se.bsnet.fukt.Mandos"
2689
1933
2690
1934
@dbus.service.signal(_interface, signature="o")
2691
1935
def ClientAdded(self, objpath):
2706
1950
def GetAllClients(self):
2707
1951
"D-Bus method"
2708
1952
return dbus.Array(c.dbus_object_path
2709
for c in
2710
tcp_server.clients.itervalues())
1953
for c in tcp_server.clients)
2711
1954
2712
1955
@dbus.service.method(_interface,
2713
1956
out_signature="a{oa{sv}}")
2715
1958
"D-Bus method"
2716
1959
return dbus.Dictionary(
2717
1960
((c.dbus_object_path, c.GetAll(""))
2718
for c in tcp_server.clients.itervalues()),
1961
for c in tcp_server.clients),
2719
1962
signature="oa{sv}")
2720
1963
2721
1964
@dbus.service.method(_interface, in_signature="o")
2722
1965
def RemoveClient(self, object_path):
2723
1966
"D-Bus method"
2724
for c in tcp_server.clients.itervalues():
1967
for c in tcp_server.clients:
2725
1968
if c.dbus_object_path == object_path:
2726
del tcp_server.clients[c.name]
1969
tcp_server.clients.remove(c)
2727
1970
c.remove_from_connection()
2728
1971
# Don't signal anything except ClientRemoved
2729
1972
c.disable(quiet=True)
2740
1983
"Cleanup function; run on exit"
2741
1984
service.cleanup()
2742
1985
2743
multiprocessing.active_children()
2744
wnull.close()
2745
if not (tcp_server.clients or client_settings):
2746
return
2747
2748
# Store client before exiting. Secrets are encrypted with key
2749
# based on what config file has. If config file is
2750
# removed/edited, old secret will thus be unrecovable.
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
2776
try:
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:
2781
pickle.dump((clients, client_settings), stored_state)
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)
2796
raise
2797
2798
# Delete all clients, and settings from config
2799
1986
while tcp_server.clients:
2800
name, client = tcp_server.clients.popitem()
1987
client = tcp_server.clients.pop()
2801
1988
if use_dbus:
2802
1989
client.remove_from_connection()
1990
client.disable_hook = None
2803
1991
# Don't signal anything except ClientRemoved
2804
1992
client.disable(quiet=True)
2805
1993
if use_dbus:
2806
1994
# Emit D-Bus signal
2807
mandos_dbus_service.ClientRemoved(client
2808
.dbus_object_path,
1995
mandos_dbus_service.ClientRemoved(client.dbus_object_path,
2809
1996
client.name)
2810
client_settings.clear()
2811
1997
2812
1998
atexit.register(cleanup)
2813
1999
2814
for client in tcp_server.clients.itervalues():
2000
for client in tcp_server.clients:
2815
2001
if use_dbus:
2816
2002
# Emit D-Bus signal
2817
2003
mandos_dbus_service.ClientAdded(client.dbus_object_path)
2818
# Need to initiate checking of clients
2819
if client.enabled:
2820
client.init_checker()
2004
client.enable()
2821
2005
2822
2006
tcp_server.enable()
2823
2007
tcp_server.server_activate()
2826
2010
service.port = tcp_server.socket.getsockname()[1]
2827
2011
if use_ipv6:
2828
2012
logger.info("Now listening on address %r, port %d,"
2829
" flowinfo %d, scope_id %d",
2830
*tcp_server.socket.getsockname())
2013
" flowinfo %d, scope_id %d"
2014
% tcp_server.socket.getsockname())
2831
2015
else: # IPv4
2832
logger.info("Now listening on address %r, port %d",
2833
*tcp_server.socket.getsockname())
2016
logger.info("Now listening on address %r, port %d"
2017
% tcp_server.socket.getsockname())
2834
2018
2835
2019
#service.interface = tcp_server.socket.getsockname()[3]
2836
2020
2838
2022
# From the Avahi example code
2839
2023
try:
2840
2024
service.activate()
2841
except dbus.exceptions.DBusException as error:
2842
logger.critical("D-Bus Exception", exc_info=error)
2025
except dbus.exceptions.DBusException, error:
2026
logger.critical("DBusException: %s", error)
2843
2027
cleanup()
2844
2028
sys.exit(1)
2845
2029
# End of Avahi example code
2851
2035
2852
2036
logger.debug("Starting main loop")
2853
2037
main_loop.run()
2854
except AvahiError as error:
2855
logger.critical("Avahi Error", exc_info=error)
2038
except AvahiError, error:
2039
logger.critical("AvahiError: %s", error)
2856
2040
cleanup()
2857
2041
sys.exit(1)
2858
2042
except KeyboardInterrupt:
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0