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/source/local-options
- network-hooks.d
- files modified:
- DBUS-API
added
removed
mandos
11
11
# "AvahiService" class, and some lines in "main".
12
12
#
13
13
# Everything else is
14
# Copyright © 2008-2012 Teddy Hogeborn
15
# Copyright © 2008-2012 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
65
72
66
import dbus
73
67
import dbus.service
78
72
import ctypes.util
79
73
import xml.dom.minidom
80
74
import inspect
81
import GnuPGInterface
82
75
83
76
try:
84
77
SO_BINDTODEVICE = socket.SO_BINDTODEVICE
88
81
except ImportError:
89
82
SO_BINDTODEVICE = None
90
83
91
version = "1.5.3"
92
stored_state_file = "clients.pickle"
93
94
logger = logging.getLogger()
84
85
version = "1.3.0"
86
87
#logger = logging.getLogger('mandos')
88
logger = logging.Logger('mandos')
95
89
syslogger = (logging.handlers.SysLogHandler
96
90
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
97
91
address = str("/dev/log")))
98
99
try:
100
if_nametoindex = (ctypes.cdll.LoadLibrary
101
(ctypes.util.find_library("c"))
102
.if_nametoindex)
103
except (OSError, AttributeError):
104
def if_nametoindex(interface):
105
"Get an interface index the hard way, i.e. using fcntl()"
106
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
107
with contextlib.closing(socket.socket()) as s:
108
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
109
struct.pack(str("16s16x"),
110
interface))
111
interface_index = struct.unpack(str("I"),
112
ifreq[16:20])[0]
113
return interface_index
114
115
116
def initlogger(debug, level=logging.WARNING):
117
"""init logger and add loglevel"""
118
119
syslogger.setFormatter(logging.Formatter
120
('Mandos [%(process)d]: %(levelname)s:'
121
' %(message)s'))
122
logger.addHandler(syslogger)
123
124
if debug:
125
console = logging.StreamHandler()
126
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
127
' [%(process)d]:'
128
' %(levelname)s:'
129
' %(message)s'))
130
logger.addHandler(console)
131
logger.setLevel(level)
132
133
134
class PGPError(Exception):
135
"""Exception if encryption/decryption fails"""
136
pass
137
138
139
class PGPEngine(object):
140
"""A simple class for OpenPGP symmetric encryption & decryption"""
141
def __init__(self):
142
self.gnupg = GnuPGInterface.GnuPG()
143
self.tempdir = tempfile.mkdtemp(prefix="mandos-")
144
self.gnupg = GnuPGInterface.GnuPG()
145
self.gnupg.options.meta_interactive = False
146
self.gnupg.options.homedir = self.tempdir
147
self.gnupg.options.extra_args.extend(['--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
return b"mandos" + binascii.hexlify(password)
178
179
def encrypt(self, data, password):
180
self.gnupg.passphrase = self.password_encode(password)
181
with open(os.devnull, "w") as devnull:
182
try:
183
proc = self.gnupg.run(['--symmetric'],
184
create_fhs=['stdin', 'stdout'],
185
attach_fhs={'stderr': devnull})
186
with contextlib.closing(proc.handles['stdin']) as f:
187
f.write(data)
188
with contextlib.closing(proc.handles['stdout']) as f:
189
ciphertext = f.read()
190
proc.wait()
191
except IOError as e:
192
raise PGPError(e)
193
self.gnupg.passphrase = None
194
return ciphertext
195
196
def decrypt(self, data, password):
197
self.gnupg.passphrase = self.password_encode(password)
198
with open(os.devnull, "w") as devnull:
199
try:
200
proc = self.gnupg.run(['--decrypt'],
201
create_fhs=['stdin', 'stdout'],
202
attach_fhs={'stderr': devnull})
203
with contextlib.closing(proc.handles['stdin']) as f:
204
f.write(data)
205
with contextlib.closing(proc.handles['stdout']) as f:
206
decrypted_plaintext = f.read()
207
proc.wait()
208
except IOError as e:
209
raise PGPError(e)
210
self.gnupg.passphrase = None
211
return decrypted_plaintext
212
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)
213
102
214
103
class AvahiError(Exception):
215
104
def __init__(self, value, *args, **kwargs):
245
134
server: D-Bus Server
246
135
bus: dbus.SystemBus()
247
136
"""
248
249
137
def __init__(self, interface = avahi.IF_UNSPEC, name = None,
250
138
servicetype = None, port = None, TXT = None,
251
139
domain = "", host = "", max_renames = 32768,
263
151
self.group = None # our entry group
264
152
self.server = None
265
153
self.bus = bus
266
self.entry_group_state_changed_match = None
267
268
154
def rename(self):
269
155
"""Derived from the Avahi example code"""
270
156
if self.rename_count >= self.max_renames:
272
158
" after %i retries, exiting.",
273
159
self.rename_count)
274
160
raise AvahiServiceError("Too many renames")
275
self.name = unicode(self.server
276
.GetAlternativeServiceName(self.name))
161
self.name = unicode(self.server.GetAlternativeServiceName(self.name))
277
162
logger.info("Changing Zeroconf service name to %r ...",
278
163
self.name)
164
syslogger.setFormatter(logging.Formatter
165
('Mandos (%s) [%%(process)d]:'
166
' %%(levelname)s: %%(message)s'
167
% self.name))
279
168
self.remove()
280
169
try:
281
170
self.add()
282
except dbus.exceptions.DBusException as error:
283
logger.critical("D-Bus Exception", exc_info=error)
171
except dbus.exceptions.DBusException, error:
172
logger.critical("DBusException: %s", error)
284
173
self.cleanup()
285
174
os._exit(1)
286
175
self.rename_count += 1
287
288
176
def remove(self):
289
177
"""Derived from the Avahi example code"""
290
if self.entry_group_state_changed_match is not None:
291
self.entry_group_state_changed_match.remove()
292
self.entry_group_state_changed_match = None
293
178
if self.group is not None:
294
179
self.group.Reset()
295
296
180
def add(self):
297
181
"""Derived from the Avahi example code"""
298
self.remove()
299
182
if self.group is None:
300
183
self.group = dbus.Interface(
301
184
self.bus.get_object(avahi.DBUS_NAME,
302
185
self.server.EntryGroupNew()),
303
186
avahi.DBUS_INTERFACE_ENTRY_GROUP)
304
self.entry_group_state_changed_match = (
305
self.group.connect_to_signal(
306
'StateChanged', self.entry_group_state_changed))
187
self.group.connect_to_signal('StateChanged',
188
self
189
.entry_group_state_changed)
307
190
logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
308
191
self.name, self.type)
309
192
self.group.AddService(
315
198
dbus.UInt16(self.port),
316
199
avahi.string_array_to_txt_array(self.TXT))
317
200
self.group.Commit()
318
319
201
def entry_group_state_changed(self, state, error):
320
202
"""Derived from the Avahi example code"""
321
203
logger.debug("Avahi entry group state change: %i", state)
328
210
elif state == avahi.ENTRY_GROUP_FAILURE:
329
211
logger.critical("Avahi: Error in group state changed %s",
330
212
unicode(error))
331
raise AvahiGroupError("State changed: {0!s}"
332
.format(error))
333
213
raise AvahiGroupError("State changed: %s"
214
% unicode(error))
334
215
def cleanup(self):
335
216
"""Derived from the Avahi example code"""
336
217
if self.group is not None:
337
try:
338
self.group.Free()
339
except (dbus.exceptions.UnknownMethodException,
340
dbus.exceptions.DBusException):
341
pass
218
self.group.Free()
342
219
self.group = None
343
self.remove()
344
345
def server_state_changed(self, state, error=None):
220
def server_state_changed(self, state):
346
221
"""Derived from the Avahi example code"""
347
222
logger.debug("Avahi server state change: %i", state)
348
bad_states = { avahi.SERVER_INVALID:
349
"Zeroconf server invalid",
350
avahi.SERVER_REGISTERING: None,
351
avahi.SERVER_COLLISION:
352
"Zeroconf server name collision",
353
avahi.SERVER_FAILURE:
354
"Zeroconf server failure" }
355
if state in bad_states:
356
if bad_states[state] is not None:
357
if error is None:
358
logger.error(bad_states[state])
359
else:
360
logger.error(bad_states[state] + ": %r", error)
361
self.cleanup()
223
if state == avahi.SERVER_COLLISION:
224
logger.error("Zeroconf server name collision")
225
self.remove()
362
226
elif state == avahi.SERVER_RUNNING:
363
227
self.add()
364
else:
365
if error is None:
366
logger.debug("Unknown state: %r", state)
367
else:
368
logger.debug("Unknown state: %r: %r", state, error)
369
370
228
def activate(self):
371
229
"""Derived from the Avahi example code"""
372
230
if self.server is None:
373
231
self.server = dbus.Interface(
374
232
self.bus.get_object(avahi.DBUS_NAME,
375
avahi.DBUS_PATH_SERVER,
376
follow_name_owner_changes=True),
233
avahi.DBUS_PATH_SERVER),
377
234
avahi.DBUS_INTERFACE_SERVER)
378
235
self.server.connect_to_signal("StateChanged",
379
236
self.server_state_changed)
380
237
self.server_state_changed(self.server.GetState())
381
238
382
class AvahiServiceToSyslog(AvahiService):
383
def rename(self):
384
"""Add the new name to the syslog messages"""
385
ret = AvahiService.rename(self)
386
syslogger.setFormatter(logging.Formatter
387
('Mandos ({0}) [%(process)d]:'
388
' %(levelname)s: %(message)s'
389
.format(self.name)))
390
return ret
391
392
def timedelta_to_milliseconds(td):
393
"Convert a datetime.timedelta() to milliseconds"
394
return ((td.days * 24 * 60 * 60 * 1000)
395
+ (td.seconds * 1000)
396
+ (td.microseconds // 1000))
397
239
398
240
class Client(object):
399
241
"""A representation of a client host served by this server.
400
242
401
243
Attributes:
402
approved: bool(); 'None' if not yet approved/disapproved
244
_approved: bool(); 'None' if not yet approved/disapproved
403
245
approval_delay: datetime.timedelta(); Time to wait for approval
404
246
approval_duration: datetime.timedelta(); Duration of one approval
405
247
checker: subprocess.Popen(); a running checker process used
412
254
instance %(name)s can be used in the command.
413
255
checker_initiator_tag: a gobject event source tag, or None
414
256
created: datetime.datetime(); (UTC) object creation
415
client_structure: Object describing what attributes a client has
416
and is used for storing the client at exit
417
257
current_checker_command: string; current running checker_command
258
disable_hook: If set, called by disable() as disable_hook(self)
418
259
disable_initiator_tag: a gobject event source tag, or None
419
260
enabled: bool()
420
261
fingerprint: string (40 or 32 hexadecimal digits); used to
423
264
interval: datetime.timedelta(); How often to start a new checker
424
265
last_approval_request: datetime.datetime(); (UTC) or None
425
266
last_checked_ok: datetime.datetime(); (UTC) or None
426
last_checker_status: integer between 0 and 255 reflecting exit
427
status of last checker. -1 reflects crashed
428
checker, -2 means no checker completed yet.
429
last_enabled: datetime.datetime(); (UTC) or None
267
last_enabled: datetime.datetime(); (UTC)
430
268
name: string; from the config file, used in log messages and
431
269
D-Bus identifiers
432
270
secret: bytestring; sent verbatim (over TLS) to client
433
271
timeout: datetime.timedelta(); How long from last_checked_ok
434
272
until this client is disabled
435
extended_timeout: extra long timeout when secret has been sent
436
273
runtime_expansions: Allowed attributes for runtime expansion.
437
expires: datetime.datetime(); time (UTC) when a client will be
438
disabled, or None
439
274
"""
440
275
441
276
runtime_expansions = ("approval_delay", "approval_duration",
442
277
"created", "enabled", "fingerprint",
443
278
"host", "interval", "last_checked_ok",
444
279
"last_enabled", "name", "timeout")
445
client_defaults = { "timeout": "5m",
446
"extended_timeout": "15m",
447
"interval": "2m",
448
"checker": "fping -q -- %%(host)s",
449
"host": "",
450
"approval_delay": "0s",
451
"approval_duration": "1s",
452
"approved_by_default": "True",
453
"enabled": "True",
454
}
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))
455
287
456
288
def timeout_milliseconds(self):
457
289
"Return the 'timeout' attribute in milliseconds"
458
return timedelta_to_milliseconds(self.timeout)
459
460
def extended_timeout_milliseconds(self):
461
"Return the 'extended_timeout' attribute in milliseconds"
462
return timedelta_to_milliseconds(self.extended_timeout)
290
return self._timedelta_to_milliseconds(self.timeout)
463
291
464
292
def interval_milliseconds(self):
465
293
"Return the 'interval' attribute in milliseconds"
466
return timedelta_to_milliseconds(self.interval)
467
294
return self._timedelta_to_milliseconds(self.interval)
295
468
296
def approval_delay_milliseconds(self):
469
return timedelta_to_milliseconds(self.approval_delay)
470
471
@staticmethod
472
def config_parser(config):
473
"""Construct a new dict of client settings of this form:
474
{ client_name: {setting_name: value, ...}, ...}
475
with exceptions for any special settings as defined above.
476
NOTE: Must be a pure function. Must return the same result
477
value given the same arguments.
478
"""
479
settings = {}
480
for client_name in config.sections():
481
section = dict(config.items(client_name))
482
client = settings[client_name] = {}
483
484
client["host"] = section["host"]
485
# Reformat values from string types to Python types
486
client["approved_by_default"] = config.getboolean(
487
client_name, "approved_by_default")
488
client["enabled"] = config.getboolean(client_name,
489
"enabled")
490
491
client["fingerprint"] = (section["fingerprint"].upper()
492
.replace(" ", ""))
493
if "secret" in section:
494
client["secret"] = section["secret"].decode("base64")
495
elif "secfile" in section:
496
with open(os.path.expanduser(os.path.expandvars
497
(section["secfile"])),
498
"rb") as secfile:
499
client["secret"] = secfile.read()
500
else:
501
raise TypeError("No secret or secfile for section {0}"
502
.format(section))
503
client["timeout"] = string_to_delta(section["timeout"])
504
client["extended_timeout"] = string_to_delta(
505
section["extended_timeout"])
506
client["interval"] = string_to_delta(section["interval"])
507
client["approval_delay"] = string_to_delta(
508
section["approval_delay"])
509
client["approval_duration"] = string_to_delta(
510
section["approval_duration"])
511
client["checker_command"] = section["checker"]
512
client["last_approval_request"] = None
513
client["last_checked_ok"] = None
514
client["last_checker_status"] = -2
515
516
return settings
517
518
def __init__(self, settings, name = 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."""
519
303
self.name = name
520
# adding all client settings
521
for setting, value in settings.iteritems():
522
setattr(self, setting, value)
523
524
if self.enabled:
525
if not hasattr(self, "last_enabled"):
526
self.last_enabled = datetime.datetime.utcnow()
527
if not hasattr(self, "expires"):
528
self.expires = (datetime.datetime.utcnow()
529
+ self.timeout)
530
else:
531
self.last_enabled = None
532
self.expires = None
533
304
if config is None:
305
config = {}
534
306
logger.debug("Creating client %r", self.name)
535
307
# Uppercase and remove spaces from fingerprint for later
536
308
# comparison purposes with return value from the fingerprint()
537
309
# function
310
self.fingerprint = (config["fingerprint"].upper()
311
.replace(" ", ""))
538
312
logger.debug(" Fingerprint: %s", self.fingerprint)
539
self.created = settings.get("created",
540
datetime.datetime.utcnow())
541
542
# 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
543
332
self.checker = None
544
333
self.checker_initiator_tag = None
545
334
self.disable_initiator_tag = None
546
335
self.checker_callback_tag = None
336
self.checker_command = config["checker"]
547
337
self.current_checker_command = None
548
self.approved = None
338
self.last_connect = None
339
self._approved = None
340
self.approved_by_default = config.get("approved_by_default",
341
True)
549
342
self.approvals_pending = 0
550
self.changedstate = (multiprocessing_manager
551
.Condition(multiprocessing_manager
552
.Lock()))
553
self.client_structure = [attr for attr in
554
self.__dict__.iterkeys()
555
if not attr.startswith("_")]
556
self.client_structure.append("client_structure")
557
558
for name, t in inspect.getmembers(type(self),
559
lambda obj:
560
isinstance(obj,
561
property)):
562
if not name.startswith("_"):
563
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())
564
348
565
# Send notice to process children that client state has changed
566
349
def send_changedstate(self):
567
with self.changedstate:
568
self.changedstate.notify_all()
569
350
self.changedstate.acquire()
351
self.changedstate.notify_all()
352
self.changedstate.release()
353
570
354
def enable(self):
571
355
"""Start this client's checker and timeout hooks"""
572
356
if getattr(self, "enabled", False):
573
357
# Already enabled
574
358
return
575
self.expires = datetime.datetime.utcnow() + self.timeout
576
self.enabled = True
359
self.send_changedstate()
577
360
self.last_enabled = datetime.datetime.utcnow()
578
self.init_checker()
579
self.send_changedstate()
580
581
def disable(self, quiet=True):
582
"""Disable this client."""
583
if not getattr(self, "enabled", False):
584
return False
585
if not quiet:
586
logger.info("Disabling client %s", self.name)
587
if getattr(self, "disable_initiator_tag", None) is not None:
588
gobject.source_remove(self.disable_initiator_tag)
589
self.disable_initiator_tag = None
590
self.expires = None
591
if getattr(self, "checker_initiator_tag", None) is not None:
592
gobject.source_remove(self.checker_initiator_tag)
593
self.checker_initiator_tag = None
594
self.stop_checker()
595
self.enabled = False
596
if not quiet:
597
self.send_changedstate()
598
# Do not run this again if called by a gobject.timeout_add
599
return False
600
601
def __del__(self):
602
self.disable()
603
604
def init_checker(self):
605
361
# Schedule a new checker to be started an 'interval' from now,
606
362
# and every interval from then on.
607
if self.checker_initiator_tag is not None:
608
gobject.source_remove(self.checker_initiator_tag)
609
363
self.checker_initiator_tag = (gobject.timeout_add
610
364
(self.interval_milliseconds(),
611
365
self.start_checker))
612
366
# Schedule a disable() when 'timeout' has passed
613
if self.disable_initiator_tag is not None:
614
gobject.source_remove(self.disable_initiator_tag)
615
367
self.disable_initiator_tag = (gobject.timeout_add
616
368
(self.timeout_milliseconds(),
617
369
self.disable))
370
self.enabled = True
618
371
# Also start a new checker *right now*.
619
372
self.start_checker()
620
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
621
399
def checker_callback(self, pid, condition, command):
622
400
"""The checker has completed, so take appropriate actions."""
623
401
self.checker_callback_tag = None
624
402
self.checker = None
625
403
if os.WIFEXITED(condition):
626
self.last_checker_status = os.WEXITSTATUS(condition)
627
if self.last_checker_status == 0:
404
exitstatus = os.WEXITSTATUS(condition)
405
if exitstatus == 0:
628
406
logger.info("Checker for %(name)s succeeded",
629
407
vars(self))
630
408
self.checked_ok()
632
410
logger.info("Checker for %(name)s failed",
633
411
vars(self))
634
412
else:
635
self.last_checker_status = -1
636
413
logger.warning("Checker for %(name)s crashed?",
637
414
vars(self))
638
415
639
416
def checked_ok(self):
640
"""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
"""
641
422
self.last_checked_ok = datetime.datetime.utcnow()
642
self.last_checker_status = 0
643
self.bump_timeout()
644
645
def bump_timeout(self, timeout=None):
646
"""Bump up the timeout for this client."""
647
if timeout is None:
648
timeout = self.timeout
649
if self.disable_initiator_tag is not None:
650
gobject.source_remove(self.disable_initiator_tag)
651
self.disable_initiator_tag = None
652
if getattr(self, "enabled", False):
653
self.disable_initiator_tag = (gobject.timeout_add
654
(timedelta_to_milliseconds
655
(timeout), self.disable))
656
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))
657
427
658
428
def need_approval(self):
659
429
self.last_approval_request = datetime.datetime.utcnow()
664
434
If a checker already exists, leave it running and do
665
435
nothing."""
666
436
# The reason for not killing a running checker is that if we
667
# did that, and if a checker (for some reason) started running
668
# slowly and taking more than 'interval' time, then the client
669
# would inevitably timeout, since no checker would get a
670
# chance to run to completion. If we instead leave running
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
671
441
# checkers alone, the checker would have to take more time
672
442
# than 'timeout' for the client to be disabled, which is as it
673
443
# should be.
675
445
# If a checker exists, make sure it is not a zombie
676
446
try:
677
447
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
678
except (AttributeError, OSError) as error:
448
except (AttributeError, OSError), error:
679
449
if (isinstance(error, OSError)
680
450
and error.errno != errno.ECHILD):
681
451
raise error
699
469
'replace')))
700
470
for attr in
701
471
self.runtime_expansions)
702
472
703
473
try:
704
474
command = self.checker_command % escaped_attrs
705
except TypeError as error:
706
logger.error('Could not format string "%s"',
707
self.checker_command, exc_info=error)
475
except TypeError, error:
476
logger.error('Could not format string "%s":'
477
' %s', self.checker_command, error)
708
478
return True # Try again later
709
479
self.current_checker_command = command
710
480
try:
727
497
if pid:
728
498
gobject.source_remove(self.checker_callback_tag)
729
499
self.checker_callback(pid, status, command)
730
except OSError as error:
731
logger.error("Failed to start subprocess",
732
exc_info=error)
500
except OSError, error:
501
logger.error("Failed to start subprocess: %s",
502
error)
733
503
# Re-run this periodically if run by gobject.timeout_add
734
504
return True
735
505
742
512
return
743
513
logger.debug("Stopping checker for %(name)s", vars(self))
744
514
try:
745
self.checker.terminate()
515
os.kill(self.checker.pid, signal.SIGTERM)
746
516
#time.sleep(0.5)
747
517
#if self.checker.poll() is None:
748
# self.checker.kill()
749
except OSError as error:
518
# os.kill(self.checker.pid, signal.SIGKILL)
519
except OSError, error:
750
520
if error.errno != errno.ESRCH: # No such process
751
521
raise
752
522
self.checker = None
753
523
754
755
524
def dbus_service_property(dbus_interface, signature="v",
756
525
access="readwrite", byte_arrays=False):
757
526
"""Decorators for marking methods of a DBusObjectWithProperties to
768
537
# "Set" method, so we fail early here:
769
538
if byte_arrays and signature != "ay":
770
539
raise ValueError("Byte arrays not supported for non-'ay'"
771
" signature {0!r}".format(signature))
540
" signature %r" % signature)
772
541
def decorator(func):
773
542
func._dbus_is_property = True
774
543
func._dbus_interface = dbus_interface
782
551
return decorator
783
552
784
553
785
def dbus_interface_annotations(dbus_interface):
786
"""Decorator for marking functions returning interface annotations
787
788
Usage:
789
790
@dbus_interface_annotations("org.example.Interface")
791
def _foo(self): # Function name does not matter
792
return {"org.freedesktop.DBus.Deprecated": "true",
793
"org.freedesktop.DBus.Property.EmitsChangedSignal":
794
"false"}
795
"""
796
def decorator(func):
797
func._dbus_is_interface = True
798
func._dbus_interface = dbus_interface
799
func._dbus_name = dbus_interface
800
return func
801
return decorator
802
803
804
def dbus_annotations(annotations):
805
"""Decorator to annotate D-Bus methods, signals or properties
806
Usage:
807
808
@dbus_service_property("org.example.Interface", signature="b",
809
access="r")
810
@dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
811
"org.freedesktop.DBus.Property."
812
"EmitsChangedSignal": "false"})
813
def Property_dbus_property(self):
814
return dbus.Boolean(False)
815
"""
816
def decorator(func):
817
func._dbus_annotations = annotations
818
return func
819
return decorator
820
821
822
554
class DBusPropertyException(dbus.exceptions.DBusException):
823
555
"""A base class for D-Bus property-related exceptions
824
556
"""
840
572
841
573
class DBusObjectWithProperties(dbus.service.Object):
842
574
"""A D-Bus object with properties.
843
575
844
576
Classes inheriting from this can use the dbus_service_property
845
577
decorator to expose methods as D-Bus properties. It exposes the
846
578
standard Get(), Set(), and GetAll() methods on the D-Bus.
847
579
"""
848
580
849
581
@staticmethod
850
def _is_dbus_thing(thing):
851
"""Returns a function testing if an attribute is a D-Bus thing
852
853
If called like _is_dbus_thing("method") it returns a function
854
suitable for use as predicate to inspect.getmembers().
855
"""
856
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
857
False)
582
def _is_dbus_property(obj):
583
return getattr(obj, "_dbus_is_property", False)
858
584
859
def _get_all_dbus_things(self, thing):
585
def _get_all_dbus_properties(self):
860
586
"""Returns a generator of (name, attribute) pairs
861
587
"""
862
return ((getattr(athing.__get__(self), "_dbus_name",
863
name),
864
athing.__get__(self))
865
for cls in self.__class__.__mro__
866
for name, athing in
867
inspect.getmembers(cls,
868
self._is_dbus_thing(thing)))
588
return ((prop._dbus_name, prop)
589
for name, prop in
590
inspect.getmembers(self, self._is_dbus_property))
869
591
870
592
def _get_dbus_property(self, interface_name, property_name):
871
593
"""Returns a bound method if one exists which is a D-Bus
872
594
property with the specified name and interface.
873
595
"""
874
for cls in self.__class__.__mro__:
875
for name, value in (inspect.getmembers
876
(cls,
877
self._is_dbus_thing("property"))):
878
if (value._dbus_name == property_name
879
and value._dbus_interface == interface_name):
880
return value.__get__(self)
881
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
882
606
# No such property
883
607
raise DBusPropertyNotFound(self.dbus_object_path + ":"
884
608
+ interface_name + "."
909
633
# signatures other than "ay".
910
634
if prop._dbus_signature != "ay":
911
635
raise ValueError
912
value = dbus.ByteArray(b''.join(chr(byte)
913
for byte in value))
636
value = dbus.ByteArray(''.join(unichr(byte)
637
for byte in value))
914
638
prop(value)
915
639
916
640
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
918
642
def GetAll(self, interface_name):
919
643
"""Standard D-Bus property GetAll() method, see D-Bus
920
644
standard.
921
645
922
646
Note: Will not include properties with access="write".
923
647
"""
924
properties = {}
925
for name, prop in self._get_all_dbus_things("property"):
648
all = {}
649
for name, prop in self._get_all_dbus_properties():
926
650
if (interface_name
927
651
and interface_name != prop._dbus_interface):
928
652
# Interface non-empty but did not match
932
656
continue
933
657
value = prop()
934
658
if not hasattr(value, "variant_level"):
935
properties[name] = value
659
all[name] = value
936
660
continue
937
properties[name] = type(value)(value, variant_level=
938
value.variant_level+1)
939
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")
940
664
941
665
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
942
666
out_signature="s",
943
667
path_keyword='object_path',
944
668
connection_keyword='connection')
945
669
def Introspect(self, object_path, connection):
946
"""Overloading of standard D-Bus method.
947
948
Inserts property tags and interface annotation tags.
670
"""Standard D-Bus method, overloaded to insert property tags.
949
671
"""
950
672
xmlstring = dbus.service.Object.Introspect(self, object_path,
951
673
connection)
958
680
e.setAttribute("access", prop._dbus_access)
959
681
return e
960
682
for if_tag in document.getElementsByTagName("interface"):
961
# Add property tags
962
683
for tag in (make_tag(document, name, prop)
963
684
for name, prop
964
in self._get_all_dbus_things("property")
685
in self._get_all_dbus_properties()
965
686
if prop._dbus_interface
966
687
== if_tag.getAttribute("name")):
967
688
if_tag.appendChild(tag)
968
# Add annotation tags
969
for typ in ("method", "signal", "property"):
970
for tag in if_tag.getElementsByTagName(typ):
971
annots = dict()
972
for name, prop in (self.
973
_get_all_dbus_things(typ)):
974
if (name == tag.getAttribute("name")
975
and prop._dbus_interface
976
== if_tag.getAttribute("name")):
977
annots.update(getattr
978
(prop,
979
"_dbus_annotations",
980
{}))
981
for name, value in annots.iteritems():
982
ann_tag = document.createElement(
983
"annotation")
984
ann_tag.setAttribute("name", name)
985
ann_tag.setAttribute("value", value)
986
tag.appendChild(ann_tag)
987
# Add interface annotation tags
988
for annotation, value in dict(
989
itertools.chain.from_iterable(
990
annotations().iteritems()
991
for name, annotations in
992
self._get_all_dbus_things("interface")
993
if name == if_tag.getAttribute("name")
994
)).iteritems():
995
ann_tag = document.createElement("annotation")
996
ann_tag.setAttribute("name", annotation)
997
ann_tag.setAttribute("value", value)
998
if_tag.appendChild(ann_tag)
999
689
# Add the names to the return values for the
1000
690
# "org.freedesktop.DBus.Properties" methods
1001
691
if (if_tag.getAttribute("name")
1014
704
xmlstring = document.toxml("utf-8")
1015
705
document.unlink()
1016
706
except (AttributeError, xml.dom.DOMException,
1017
xml.parsers.expat.ExpatError) as error:
707
xml.parsers.expat.ExpatError), error:
1018
708
logger.error("Failed to override Introspection method",
1019
exc_info=error)
709
error)
1020
710
return xmlstring
1021
711
1022
712
1023
def datetime_to_dbus (dt, variant_level=0):
1024
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1025
if dt is None:
1026
return dbus.String("", variant_level = variant_level)
1027
return dbus.String(dt.isoformat(),
1028
variant_level=variant_level)
1029
1030
1031
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1032
"""A class decorator; applied to a subclass of
1033
dbus.service.Object, it will add alternate D-Bus attributes with
1034
interface names according to the "alt_interface_names" mapping.
1035
Usage:
1036
1037
@alternate_dbus_names({"org.example.Interface":
1038
"net.example.AlternateInterface"})
1039
class SampleDBusObject(dbus.service.Object):
1040
@dbus.service.method("org.example.Interface")
1041
def SampleDBusMethod():
1042
pass
1043
1044
The above "SampleDBusMethod" on "SampleDBusObject" will be
1045
reachable via two interfaces: "org.example.Interface" and
1046
"net.example.AlternateInterface", the latter of which will have
1047
its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
1048
"true", unless "deprecate" is passed with a False value.
1049
1050
This works for methods and signals, and also for D-Bus properties
1051
(from DBusObjectWithProperties) and interfaces (from the
1052
dbus_interface_annotations decorator).
1053
"""
1054
def wrapper(cls):
1055
for orig_interface_name, alt_interface_name in (
1056
alt_interface_names.iteritems()):
1057
attr = {}
1058
interface_names = set()
1059
# Go though all attributes of the class
1060
for attrname, attribute in inspect.getmembers(cls):
1061
# Ignore non-D-Bus attributes, and D-Bus attributes
1062
# with the wrong interface name
1063
if (not hasattr(attribute, "_dbus_interface")
1064
or not attribute._dbus_interface
1065
.startswith(orig_interface_name)):
1066
continue
1067
# Create an alternate D-Bus interface name based on
1068
# the current name
1069
alt_interface = (attribute._dbus_interface
1070
.replace(orig_interface_name,
1071
alt_interface_name))
1072
interface_names.add(alt_interface)
1073
# Is this a D-Bus signal?
1074
if getattr(attribute, "_dbus_is_signal", False):
1075
# Extract the original non-method function by
1076
# black magic
1077
nonmethod_func = (dict(
1078
zip(attribute.func_code.co_freevars,
1079
attribute.__closure__))["func"]
1080
.cell_contents)
1081
# Create a new, but exactly alike, function
1082
# object, and decorate it to be a new D-Bus signal
1083
# with the alternate D-Bus interface name
1084
new_function = (dbus.service.signal
1085
(alt_interface,
1086
attribute._dbus_signature)
1087
(types.FunctionType(
1088
nonmethod_func.func_code,
1089
nonmethod_func.func_globals,
1090
nonmethod_func.func_name,
1091
nonmethod_func.func_defaults,
1092
nonmethod_func.func_closure)))
1093
# Copy annotations, if any
1094
try:
1095
new_function._dbus_annotations = (
1096
dict(attribute._dbus_annotations))
1097
except AttributeError:
1098
pass
1099
# Define a creator of a function to call both the
1100
# original and alternate functions, so both the
1101
# original and alternate signals gets sent when
1102
# the function is called
1103
def fixscope(func1, func2):
1104
"""This function is a scope container to pass
1105
func1 and func2 to the "call_both" function
1106
outside of its arguments"""
1107
def call_both(*args, **kwargs):
1108
"""This function will emit two D-Bus
1109
signals by calling func1 and func2"""
1110
func1(*args, **kwargs)
1111
func2(*args, **kwargs)
1112
return call_both
1113
# Create the "call_both" function and add it to
1114
# the class
1115
attr[attrname] = fixscope(attribute, new_function)
1116
# Is this a D-Bus method?
1117
elif getattr(attribute, "_dbus_is_method", False):
1118
# Create a new, but exactly alike, function
1119
# object. Decorate it to be a new D-Bus method
1120
# with the alternate D-Bus interface name. Add it
1121
# to the class.
1122
attr[attrname] = (dbus.service.method
1123
(alt_interface,
1124
attribute._dbus_in_signature,
1125
attribute._dbus_out_signature)
1126
(types.FunctionType
1127
(attribute.func_code,
1128
attribute.func_globals,
1129
attribute.func_name,
1130
attribute.func_defaults,
1131
attribute.func_closure)))
1132
# Copy annotations, if any
1133
try:
1134
attr[attrname]._dbus_annotations = (
1135
dict(attribute._dbus_annotations))
1136
except AttributeError:
1137
pass
1138
# Is this a D-Bus property?
1139
elif getattr(attribute, "_dbus_is_property", False):
1140
# Create a new, but exactly alike, function
1141
# object, and decorate it to be a new D-Bus
1142
# property with the alternate D-Bus interface
1143
# name. Add it to the class.
1144
attr[attrname] = (dbus_service_property
1145
(alt_interface,
1146
attribute._dbus_signature,
1147
attribute._dbus_access,
1148
attribute
1149
._dbus_get_args_options
1150
["byte_arrays"])
1151
(types.FunctionType
1152
(attribute.func_code,
1153
attribute.func_globals,
1154
attribute.func_name,
1155
attribute.func_defaults,
1156
attribute.func_closure)))
1157
# Copy annotations, if any
1158
try:
1159
attr[attrname]._dbus_annotations = (
1160
dict(attribute._dbus_annotations))
1161
except AttributeError:
1162
pass
1163
# Is this a D-Bus interface?
1164
elif getattr(attribute, "_dbus_is_interface", False):
1165
# Create a new, but exactly alike, function
1166
# object. Decorate it to be a new D-Bus interface
1167
# with the alternate D-Bus interface name. Add it
1168
# to the class.
1169
attr[attrname] = (dbus_interface_annotations
1170
(alt_interface)
1171
(types.FunctionType
1172
(attribute.func_code,
1173
attribute.func_globals,
1174
attribute.func_name,
1175
attribute.func_defaults,
1176
attribute.func_closure)))
1177
if deprecate:
1178
# Deprecate all alternate interfaces
1179
iname="_AlternateDBusNames_interface_annotation{0}"
1180
for interface_name in interface_names:
1181
@dbus_interface_annotations(interface_name)
1182
def func(self):
1183
return { "org.freedesktop.DBus.Deprecated":
1184
"true" }
1185
# Find an unused name
1186
for aname in (iname.format(i)
1187
for i in itertools.count()):
1188
if aname not in attr:
1189
attr[aname] = func
1190
break
1191
if interface_names:
1192
# Replace the class with a new subclass of it with
1193
# methods, signals, etc. as created above.
1194
cls = type(b"{0}Alternate".format(cls.__name__),
1195
(cls,), attr)
1196
return cls
1197
return wrapper
1198
1199
1200
@alternate_dbus_interfaces({"se.recompile.Mandos":
1201
"se.bsnet.fukt.Mandos"})
1202
713
class ClientDBus(Client, DBusObjectWithProperties):
1203
714
"""A Client class using D-Bus
1204
715
1213
724
# dbus.service.Object doesn't use super(), so we can't either.
1214
725
1215
726
def __init__(self, bus = None, *args, **kwargs):
727
self._approvals_pending = 0
1216
728
self.bus = bus
1217
729
Client.__init__(self, *args, **kwargs)
1218
730
# Only now, when this client is initialized, can it show up on
1224
736
("/clients/" + client_object_name))
1225
737
DBusObjectWithProperties.__init__(self, self.bus,
1226
738
self.dbus_object_path)
1227
1228
def notifychangeproperty(transform_func,
1229
dbus_name, type_func=lambda x: x,
1230
variant_level=1):
1231
""" Modify a variable so that it's a property which announces
1232
its changes to DBus.
1233
1234
transform_fun: Function that takes a value and a variant_level
1235
and transforms it to a D-Bus type.
1236
dbus_name: D-Bus name of the variable
1237
type_func: Function that transform the value before sending it
1238
to the D-Bus. Default: no transform
1239
variant_level: D-Bus variant level. Default: 1
1240
"""
1241
attrname = "_{0}".format(dbus_name)
1242
def setter(self, value):
1243
if hasattr(self, "dbus_object_path"):
1244
if (not hasattr(self, attrname) or
1245
type_func(getattr(self, attrname, None))
1246
!= type_func(value)):
1247
dbus_value = transform_func(type_func(value),
1248
variant_level
1249
=variant_level)
1250
self.PropertyChanged(dbus.String(dbus_name),
1251
dbus_value)
1252
setattr(self, attrname, value)
1253
1254
return property(lambda self: getattr(self, attrname), setter)
1255
1256
expires = notifychangeproperty(datetime_to_dbus, "Expires")
1257
approvals_pending = notifychangeproperty(dbus.Boolean,
1258
"ApprovalPending",
1259
type_func = bool)
1260
enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1261
last_enabled = notifychangeproperty(datetime_to_dbus,
1262
"LastEnabled")
1263
checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
1264
type_func = lambda checker:
1265
checker is not None)
1266
last_checked_ok = notifychangeproperty(datetime_to_dbus,
1267
"LastCheckedOK")
1268
last_checker_status = notifychangeproperty(dbus.Int16,
1269
"LastCheckerStatus")
1270
last_approval_request = notifychangeproperty(
1271
datetime_to_dbus, "LastApprovalRequest")
1272
approved_by_default = notifychangeproperty(dbus.Boolean,
1273
"ApprovedByDefault")
1274
approval_delay = notifychangeproperty(dbus.UInt64,
1275
"ApprovalDelay",
1276
type_func =
1277
timedelta_to_milliseconds)
1278
approval_duration = notifychangeproperty(
1279
dbus.UInt64, "ApprovalDuration",
1280
type_func = timedelta_to_milliseconds)
1281
host = notifychangeproperty(dbus.String, "Host")
1282
timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1283
type_func =
1284
timedelta_to_milliseconds)
1285
extended_timeout = notifychangeproperty(
1286
dbus.UInt64, "ExtendedTimeout",
1287
type_func = timedelta_to_milliseconds)
1288
interval = notifychangeproperty(dbus.UInt64,
1289
"Interval",
1290
type_func =
1291
timedelta_to_milliseconds)
1292
checker_command = notifychangeproperty(dbus.String, "Checker")
1293
1294
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
1295
783
1296
784
def __del__(self, *args, **kwargs):
1297
785
try:
1306
794
*args, **kwargs):
1307
795
self.checker_callback_tag = None
1308
796
self.checker = None
797
# Emit D-Bus signal
798
self.PropertyChanged(dbus.String("CheckerRunning"),
799
dbus.Boolean(False, variant_level=1))
1309
800
if os.WIFEXITED(condition):
1310
801
exitstatus = os.WEXITSTATUS(condition)
1311
802
# Emit D-Bus signal
1321
812
return Client.checker_callback(self, pid, condition, command,
1322
813
*args, **kwargs)
1323
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
1324
833
def start_checker(self, *args, **kwargs):
1325
834
old_checker = self.checker
1326
835
if self.checker is not None:
1333
842
and old_checker_pid != self.checker.pid):
1334
843
# Emit D-Bus signal
1335
844
self.CheckerStarted(self.current_checker_command)
845
self.PropertyChanged(
846
dbus.String("CheckerRunning"),
847
dbus.Boolean(True, variant_level=1))
1336
848
return r
1337
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
1338
859
def _reset_approved(self):
1339
self.approved = None
860
self._approved = None
1340
861
return False
1341
862
1342
863
def approve(self, value=True):
1343
self.approved = value
1344
gobject.timeout_add(timedelta_to_milliseconds
864
self.send_changedstate()
865
self._approved = value
866
gobject.timeout_add(self._timedelta_to_milliseconds
1345
867
(self.approval_duration),
1346
868
self._reset_approved)
1347
self.send_changedstate()
869
1348
870
1349
871
## D-Bus methods, signals & properties
1350
_interface = "se.recompile.Mandos.Client"
1351
1352
## Interfaces
1353
1354
@dbus_interface_annotations(_interface)
1355
def _foo(self):
1356
return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
1357
"false"}
872
_interface = "se.bsnet.fukt.Mandos.Client"
1358
873
1359
874
## Signals
1360
875
1407
922
# CheckedOK - method
1408
923
@dbus.service.method(_interface)
1409
924
def CheckedOK(self):
1410
self.checked_ok()
925
return self.checked_ok()
1411
926
1412
927
# Enable - method
1413
928
@dbus.service.method(_interface)
1446
961
if value is None: # get
1447
962
return dbus.Boolean(self.approved_by_default)
1448
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))
1449
967
1450
968
# ApprovalDelay - property
1451
969
@dbus_service_property(_interface, signature="t",
1454
972
if value is None: # get
1455
973
return dbus.UInt64(self.approval_delay_milliseconds())
1456
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))
1457
978
1458
979
# ApprovalDuration - property
1459
980
@dbus_service_property(_interface, signature="t",
1460
981
access="readwrite")
1461
982
def ApprovalDuration_dbus_property(self, value=None):
1462
983
if value is None: # get
1463
return dbus.UInt64(timedelta_to_milliseconds(
984
return dbus.UInt64(self._timedelta_to_milliseconds(
1464
985
self.approval_duration))
1465
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))
1466
990
1467
991
# Name - property
1468
992
@dbus_service_property(_interface, signature="s", access="read")
1480
1004
def Host_dbus_property(self, value=None):
1481
1005
if value is None: # get
1482
1006
return dbus.String(self.host)
1483
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))
1484
1011
1485
1012
# Created - property
1486
1013
@dbus_service_property(_interface, signature="s", access="read")
1487
1014
def Created_dbus_property(self):
1488
return datetime_to_dbus(self.created)
1015
return dbus.String(self._datetime_to_dbus(self.created))
1489
1016
1490
1017
# LastEnabled - property
1491
1018
@dbus_service_property(_interface, signature="s", access="read")
1492
1019
def LastEnabled_dbus_property(self):
1493
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))
1494
1023
1495
1024
# Enabled - property
1496
1025
@dbus_service_property(_interface, signature="b",
1510
1039
if value is not None:
1511
1040
self.checked_ok()
1512
1041
return
1513
return datetime_to_dbus(self.last_checked_ok)
1514
1515
# LastCheckerStatus - property
1516
@dbus_service_property(_interface, signature="n",
1517
access="read")
1518
def LastCheckerStatus_dbus_property(self):
1519
return dbus.Int16(self.last_checker_status)
1520
1521
# Expires - property
1522
@dbus_service_property(_interface, signature="s", access="read")
1523
def Expires_dbus_property(self):
1524
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))
1525
1046
1526
1047
# LastApprovalRequest - property
1527
1048
@dbus_service_property(_interface, signature="s", access="read")
1528
1049
def LastApprovalRequest_dbus_property(self):
1529
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))
1530
1055
1531
1056
# Timeout - property
1532
1057
@dbus_service_property(_interface, signature="t",
1534
1059
def Timeout_dbus_property(self, value=None):
1535
1060
if value is None: # get
1536
1061
return dbus.UInt64(self.timeout_milliseconds())
1537
old_timeout = self.timeout
1538
1062
self.timeout = datetime.timedelta(0, 0, 0, value)
1539
# Reschedule disabling
1540
if self.enabled:
1541
now = datetime.datetime.utcnow()
1542
self.expires += self.timeout - old_timeout
1543
if self.expires <= now:
1544
# The timeout has passed
1545
self.disable()
1546
else:
1547
if (getattr(self, "disable_initiator_tag", None)
1548
is None):
1549
return
1550
gobject.source_remove(self.disable_initiator_tag)
1551
self.disable_initiator_tag = (
1552
gobject.timeout_add(
1553
timedelta_to_milliseconds(self.expires - now),
1554
self.disable))
1555
1556
# ExtendedTimeout - property
1557
@dbus_service_property(_interface, signature="t",
1558
access="readwrite")
1559
def ExtendedTimeout_dbus_property(self, value=None):
1560
if value is None: # get
1561
return dbus.UInt64(self.extended_timeout_milliseconds())
1562
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))
1563
1083
1564
1084
# Interval - property
1565
1085
@dbus_service_property(_interface, signature="t",
1568
1088
if value is None: # get
1569
1089
return dbus.UInt64(self.interval_milliseconds())
1570
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))
1571
1094
if getattr(self, "checker_initiator_tag", None) is None:
1572
1095
return
1573
if self.enabled:
1574
# Reschedule checker run
1575
gobject.source_remove(self.checker_initiator_tag)
1576
self.checker_initiator_tag = (gobject.timeout_add
1577
(value, self.start_checker))
1578
self.start_checker() # Start one now, too
1579
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
1580
1102
# Checker - property
1581
1103
@dbus_service_property(_interface, signature="s",
1582
1104
access="readwrite")
1583
1105
def Checker_dbus_property(self, value=None):
1584
1106
if value is None: # get
1585
1107
return dbus.String(self.checker_command)
1586
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))
1587
1113
1588
1114
# CheckerRunning - property
1589
1115
@dbus_service_property(_interface, signature="b",
1616
1142
self._pipe.send(('init', fpr, address))
1617
1143
if not self._pipe.recv():
1618
1144
raise KeyError()
1619
1145
1620
1146
def __getattribute__(self, name):
1621
if name == '_pipe':
1147
if(name == '_pipe'):
1622
1148
return super(ProxyClient, self).__getattribute__(name)
1623
1149
self._pipe.send(('getattr', name))
1624
1150
data = self._pipe.recv()
1629
1155
self._pipe.send(('funcall', name, args, kwargs))
1630
1156
return self._pipe.recv()[1]
1631
1157
return func
1632
1158
1633
1159
def __setattr__(self, name, value):
1634
if name == '_pipe':
1160
if(name == '_pipe'):
1635
1161
return super(ProxyClient, self).__setattr__(name, value)
1636
1162
self._pipe.send(('setattr', name, value))
1637
1163
1648
1174
unicode(self.client_address))
1649
1175
logger.debug("Pipe FD: %d",
1650
1176
self.server.child_pipe.fileno())
1651
1177
1652
1178
session = (gnutls.connection
1653
1179
.ClientSession(self.request,
1654
1180
gnutls.connection
1655
1181
.X509Credentials()))
1656
1182
1657
1183
# Note: gnutls.connection.X509Credentials is really a
1658
1184
# generic GnuTLS certificate credentials object so long as
1659
1185
# no X.509 keys are added to it. Therefore, we can use it
1660
1186
# here despite using OpenPGP certificates.
1661
1187
1662
1188
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1663
1189
# "+AES-256-CBC", "+SHA1",
1664
1190
# "+COMP-NULL", "+CTYPE-OPENPGP",
1670
1196
(gnutls.library.functions
1671
1197
.gnutls_priority_set_direct(session._c_object,
1672
1198
priority, None))
1673
1199
1674
1200
# Start communication using the Mandos protocol
1675
1201
# Get protocol number
1676
1202
line = self.request.makefile().readline()
1678
1204
try:
1679
1205
if int(line.strip().split()[0]) > 1:
1680
1206
raise RuntimeError
1681
except (ValueError, IndexError, RuntimeError) as error:
1207
except (ValueError, IndexError, RuntimeError), error:
1682
1208
logger.error("Unknown protocol version: %s", error)
1683
1209
return
1684
1210
1685
1211
# Start GnuTLS connection
1686
1212
try:
1687
1213
session.handshake()
1688
except gnutls.errors.GNUTLSError as error:
1214
except gnutls.errors.GNUTLSError, error:
1689
1215
logger.warning("Handshake failed: %s", error)
1690
1216
# Do not run session.bye() here: the session is not
1691
1217
# established. Just abandon the request.
1692
1218
return
1693
1219
logger.debug("Handshake succeeded")
1694
1220
1695
1221
approval_required = False
1696
1222
try:
1697
1223
try:
1698
1224
fpr = self.fingerprint(self.peer_certificate
1699
1225
(session))
1700
except (TypeError,
1701
gnutls.errors.GNUTLSError) as error:
1226
except (TypeError, gnutls.errors.GNUTLSError), error:
1702
1227
logger.warning("Bad certificate: %s", error)
1703
1228
return
1704
1229
logger.debug("Fingerprint: %s", fpr)
1705
1230
1706
1231
try:
1707
1232
client = ProxyClient(child_pipe, fpr,
1708
1233
self.client_address)
1716
1241
1717
1242
while True:
1718
1243
if not client.enabled:
1719
logger.info("Client %s is disabled",
1244
logger.warning("Client %s is disabled",
1720
1245
client.name)
1721
1246
if self.server.use_dbus:
1722
1247
# Emit D-Bus signal
1723
client.Rejected("Disabled")
1248
client.Rejected("Disabled")
1724
1249
return
1725
1250
1726
if client.approved or not client.approval_delay:
1251
if client._approved or not client.approval_delay:
1727
1252
#We are approved or approval is disabled
1728
1253
break
1729
elif client.approved is None:
1254
elif client._approved is None:
1730
1255
logger.info("Client %s needs approval",
1731
1256
client.name)
1732
1257
if self.server.use_dbus:
1743
1268
return
1744
1269
1745
1270
#wait until timeout or approved
1271
#x = float(client._timedelta_to_milliseconds(delay))
1746
1272
time = datetime.datetime.now()
1747
1273
client.changedstate.acquire()
1748
client.changedstate.wait(
1749
float(timedelta_to_milliseconds(delay)
1750
/ 1000))
1274
client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
1751
1275
client.changedstate.release()
1752
1276
time2 = datetime.datetime.now()
1753
1277
if (time2 - time) >= delay:
1768
1292
while sent_size < len(client.secret):
1769
1293
try:
1770
1294
sent = session.send(client.secret[sent_size:])
1771
except gnutls.errors.GNUTLSError as error:
1772
logger.warning("gnutls send failed",
1773
exc_info=error)
1295
except (gnutls.errors.GNUTLSError), error:
1296
logger.warning("gnutls send failed")
1774
1297
return
1775
1298
logger.debug("Sent: %d, remaining: %d",
1776
1299
sent, len(client.secret)
1777
1300
- (sent_size + sent))
1778
1301
sent_size += sent
1779
1302
1780
1303
logger.info("Sending secret to %s", client.name)
1781
# bump the timeout using extended_timeout
1782
client.bump_timeout(client.extended_timeout)
1304
# bump the timeout as if seen
1305
client.checked_ok()
1783
1306
if self.server.use_dbus:
1784
1307
# Emit D-Bus signal
1785
1308
client.GotSecret()
1789
1312
client.approvals_pending -= 1
1790
1313
try:
1791
1314
session.bye()
1792
except gnutls.errors.GNUTLSError as error:
1793
logger.warning("GnuTLS bye failed",
1794
exc_info=error)
1315
except (gnutls.errors.GNUTLSError), error:
1316
logger.warning("GnuTLS bye failed")
1795
1317
1796
1318
@staticmethod
1797
1319
def peer_certificate(session):
1853
1375
# Convert the buffer to a Python bytestring
1854
1376
fpr = ctypes.string_at(buf, buf_len.value)
1855
1377
# Convert the bytestring to hexadecimal notation
1856
hex_fpr = binascii.hexlify(fpr).upper()
1378
hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
1857
1379
return hex_fpr
1858
1380
1859
1381
1862
1384
def sub_process_main(self, request, address):
1863
1385
try:
1864
1386
self.finish_request(request, address)
1865
except Exception:
1387
except:
1866
1388
self.handle_error(request, address)
1867
1389
self.close_request(request)
1868
1390
1869
1391
def process_request(self, request, address):
1870
1392
"""Start a new process to process the request."""
1871
proc = multiprocessing.Process(target = self.sub_process_main,
1872
args = (request, address))
1873
proc.start()
1874
return proc
1875
1393
multiprocessing.Process(target = self.sub_process_main,
1394
args = (request, address)).start()
1876
1395
1877
1396
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1878
1397
""" adds a pipe to the MixIn """
1882
1401
This function creates a new pipe in self.pipe
1883
1402
"""
1884
1403
parent_pipe, self.child_pipe = multiprocessing.Pipe()
1885
1886
proc = MultiprocessingMixIn.process_request(self, request,
1887
client_address)
1404
1405
super(MultiprocessingMixInWithPipe,
1406
self).process_request(request, client_address)
1888
1407
self.child_pipe.close()
1889
self.add_pipe(parent_pipe, proc)
1890
1891
def add_pipe(self, parent_pipe, proc):
1408
self.add_pipe(parent_pipe)
1409
1410
def add_pipe(self, parent_pipe):
1892
1411
"""Dummy function; override as necessary"""
1893
1412
raise NotImplementedError
1894
1413
1895
1896
1414
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1897
1415
socketserver.TCPServer, object):
1898
1416
"""IPv6-capable TCP server. Accepts 'None' as address and/or port
1924
1442
SO_BINDTODEVICE,
1925
1443
str(self.interface
1926
1444
+ '\0'))
1927
except socket.error as error:
1445
except socket.error, error:
1928
1446
if error[0] == errno.EPERM:
1929
1447
logger.error("No permission to"
1930
1448
" bind to interface %s",
1972
1490
self.enabled = False
1973
1491
self.clients = clients
1974
1492
if self.clients is None:
1975
self.clients = {}
1493
self.clients = set()
1976
1494
self.use_dbus = use_dbus
1977
1495
self.gnutls_priority = gnutls_priority
1978
1496
IPv6_TCPServer.__init__(self, server_address,
1982
1500
def server_activate(self):
1983
1501
if self.enabled:
1984
1502
return socketserver.TCPServer.server_activate(self)
1985
1986
1503
def enable(self):
1987
1504
self.enabled = True
1988
1989
def add_pipe(self, parent_pipe, proc):
1505
def add_pipe(self, parent_pipe):
1990
1506
# Call "handle_ipc" for both data and EOF events
1991
1507
gobject.io_add_watch(parent_pipe.fileno(),
1992
1508
gobject.IO_IN | gobject.IO_HUP,
1993
1509
functools.partial(self.handle_ipc,
1994
parent_pipe =
1995
parent_pipe,
1996
proc = proc))
1997
1510
parent_pipe = parent_pipe))
1511
1998
1512
def handle_ipc(self, source, condition, parent_pipe=None,
1999
proc = None, client_object=None):
2000
# error, or the other end of multiprocessing.Pipe has closed
2001
if condition & (gobject.IO_ERR | gobject.IO_HUP):
2002
# Wait for other process to exit
2003
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):
2004
1530
return False
2005
1531
2006
1532
# Read a request from the child
2011
1537
fpr = request[1]
2012
1538
address = request[2]
2013
1539
2014
for c in self.clients.itervalues():
1540
for c in self.clients:
2015
1541
if c.fingerprint == fpr:
2016
1542
client = c
2017
1543
break
2018
1544
else:
2019
logger.info("Client not found for fingerprint: %s, ad"
2020
"dress: %s", fpr, address)
1545
logger.warning("Client not found for fingerprint: %s, ad"
1546
"dress: %s", fpr, address)
2021
1547
if self.use_dbus:
2022
1548
# Emit D-Bus signal
2023
mandos_dbus_service.ClientNotFound(fpr,
2024
address[0])
1549
mandos_dbus_service.ClientNotFound(fpr, address[0])
2025
1550
parent_pipe.send(False)
2026
1551
return False
2027
1552
2028
1553
gobject.io_add_watch(parent_pipe.fileno(),
2029
1554
gobject.IO_IN | gobject.IO_HUP,
2030
1555
functools.partial(self.handle_ipc,
2031
parent_pipe =
2032
parent_pipe,
2033
proc = proc,
2034
client_object =
2035
client))
1556
parent_pipe = parent_pipe,
1557
client_object = client))
2036
1558
parent_pipe.send(True)
2037
# remove the old hook in favor of the new above hook on
2038
# same fileno
1559
# remove the old hook in favor of the new above hook on same fileno
2039
1560
return False
2040
1561
if command == 'funcall':
2041
1562
funcname = request[1]
2042
1563
args = request[2]
2043
1564
kwargs = request[3]
2044
1565
2045
parent_pipe.send(('data', getattr(client_object,
2046
funcname)(*args,
2047
**kwargs)))
2048
1566
parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
1567
2049
1568
if command == 'getattr':
2050
1569
attrname = request[1]
2051
1570
if callable(client_object.__getattribute__(attrname)):
2052
1571
parent_pipe.send(('function',))
2053
1572
else:
2054
parent_pipe.send(('data', client_object
2055
.__getattribute__(attrname)))
1573
parent_pipe.send(('data', client_object.__getattribute__(attrname)))
2056
1574
2057
1575
if command == 'setattr':
2058
1576
attrname = request[1]
2059
1577
value = request[2]
2060
1578
setattr(client_object, attrname, value)
2061
1579
2062
1580
return True
2063
1581
2064
1582
2094
1612
elif suffix == "w":
2095
1613
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2096
1614
else:
2097
raise ValueError("Unknown suffix {0!r}"
2098
.format(suffix))
2099
except (ValueError, IndexError) as e:
1615
raise ValueError("Unknown suffix %r" % suffix)
1616
except (ValueError, IndexError), e:
2100
1617
raise ValueError(*(e.args))
2101
1618
timevalue += delta
2102
1619
return timevalue
2103
1620
2104
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
2105
1646
def daemon(nochdir = False, noclose = False):
2106
1647
"""See daemon(3). Standard BSD Unix function.
2107
1648
2115
1656
sys.exit()
2116
1657
if not noclose:
2117
1658
# Close all standard open file descriptors
2118
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
1659
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2119
1660
if not stat.S_ISCHR(os.fstat(null).st_mode):
2120
1661
raise OSError(errno.ENODEV,
2121
"{0} not a character device"
2122
.format(os.devnull))
1662
"%s not a character device"
1663
% os.path.devnull)
2123
1664
os.dup2(null, sys.stdin.fileno())
2124
1665
os.dup2(null, sys.stdout.fileno())
2125
1666
os.dup2(null, sys.stderr.fileno())
2134
1675
2135
1676
parser = argparse.ArgumentParser()
2136
1677
parser.add_argument("-v", "--version", action="version",
2137
version = "%(prog)s {0}".format(version),
1678
version = "%%(prog)s %s" % version,
2138
1679
help="show version number and exit")
2139
1680
parser.add_argument("-i", "--interface", metavar="IF",
2140
1681
help="Bind to interface IF")
2162
1703
" system bus interface")
2163
1704
parser.add_argument("--no-ipv6", action="store_false",
2164
1705
dest="use_ipv6", help="Do not use IPv6")
2165
parser.add_argument("--no-restore", action="store_false",
2166
dest="restore", help="Do not restore stored"
2167
" state")
2168
parser.add_argument("--statedir", metavar="DIR",
2169
help="Directory to save/restore state in")
2170
2171
1706
options = parser.parse_args()
2172
1707
2173
1708
if options.check:
2186
1721
"use_dbus": "True",
2187
1722
"use_ipv6": "True",
2188
1723
"debuglevel": "",
2189
"restore": "True",
2190
"statedir": "/var/lib/mandos"
2191
1724
}
2192
1725
2193
1726
# Parse config file for server-global settings
2210
1743
# options, if set.
2211
1744
for option in ("interface", "address", "port", "debug",
2212
1745
"priority", "servicename", "configdir",
2213
"use_dbus", "use_ipv6", "debuglevel", "restore",
2214
"statedir"):
1746
"use_dbus", "use_ipv6", "debuglevel"):
2215
1747
value = getattr(options, option)
2216
1748
if value is not None:
2217
1749
server_settings[option] = value
2229
1761
debuglevel = server_settings["debuglevel"]
2230
1762
use_dbus = server_settings["use_dbus"]
2231
1763
use_ipv6 = server_settings["use_ipv6"]
2232
stored_state_path = os.path.join(server_settings["statedir"],
2233
stored_state_file)
2234
2235
if debug:
2236
initlogger(debug, logging.DEBUG)
2237
else:
2238
if not debuglevel:
2239
initlogger(debug)
2240
else:
2241
level = getattr(logging, debuglevel.upper())
2242
initlogger(debug, level)
2243
1764
2244
1765
if server_settings["servicename"] != "Mandos":
2245
1766
syslogger.setFormatter(logging.Formatter
2246
('Mandos ({0}) [%(process)d]:'
2247
' %(levelname)s: %(message)s'
2248
.format(server_settings
2249
["servicename"])))
1767
('Mandos (%s) [%%(process)d]:'
1768
' %%(levelname)s: %%(message)s'
1769
% server_settings["servicename"]))
2250
1770
2251
1771
# Parse config file with clients
2252
client_config = configparser.SafeConfigParser(Client
2253
.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)
2254
1780
client_config.read(os.path.join(server_settings["configdir"],
2255
1781
"clients.conf"))
2256
1782
2270
1796
pidfilename = "/var/run/mandos.pid"
2271
1797
try:
2272
1798
pidfile = open(pidfilename, "w")
2273
except IOError as e:
2274
logger.error("Could not open file %r", pidfilename,
2275
exc_info=e)
1799
except IOError:
1800
logger.error("Could not open file %r", pidfilename)
2276
1801
2277
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:
2278
1806
try:
2279
uid = pwd.getpwnam(name).pw_uid
2280
gid = pwd.getpwnam(name).pw_gid
2281
break
1807
uid = pwd.getpwnam("mandos").pw_uid
1808
gid = pwd.getpwnam("mandos").pw_gid
2282
1809
except KeyError:
2283
continue
2284
else:
2285
uid = 65534
2286
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
2287
1816
try:
2288
1817
os.setgid(gid)
2289
1818
os.setuid(uid)
2290
except OSError as error:
1819
except OSError, error:
2291
1820
if error[0] != errno.EPERM:
2292
1821
raise error
2293
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
2294
1831
if debug:
2295
1832
# Enable all possible GnuTLS debugging
2296
1833
2306
1843
.gnutls_global_set_log_function(debug_gnutls))
2307
1844
2308
1845
# Redirect stdin so all checkers get /dev/null
2309
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
1846
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2310
1847
os.dup2(null, sys.stdin.fileno())
2311
1848
if null > 2:
2312
1849
os.close(null)
1850
else:
1851
# No console logging
1852
logger.removeHandler(console)
2313
1853
2314
1854
# Need to fork before connecting to D-Bus
2315
1855
if not debug:
2316
1856
# Close all input and output, do double fork, etc.
2317
1857
daemon()
2318
1858
2319
gobject.threads_init()
2320
2321
1859
global main_loop
2322
1860
# From the Avahi example code
2323
DBusGMainLoop(set_as_default=True)
1861
DBusGMainLoop(set_as_default=True )
2324
1862
main_loop = gobject.MainLoop()
2325
1863
bus = dbus.SystemBus()
2326
1864
# End of Avahi example code
2327
1865
if use_dbus:
2328
1866
try:
2329
bus_name = dbus.service.BusName("se.recompile.Mandos",
1867
bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
2330
1868
bus, do_not_queue=True)
2331
old_bus_name = (dbus.service.BusName
2332
("se.bsnet.fukt.Mandos", bus,
2333
do_not_queue=True))
2334
except dbus.exceptions.NameExistsException as e:
2335
logger.error("Disabling D-Bus:", exc_info=e)
1869
except dbus.exceptions.NameExistsException, e:
1870
logger.error(unicode(e) + ", disabling D-Bus")
2336
1871
use_dbus = False
2337
1872
server_settings["use_dbus"] = False
2338
1873
tcp_server.use_dbus = False
2339
1874
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2340
service = AvahiServiceToSyslog(name =
2341
server_settings["servicename"],
2342
servicetype = "_mandos._tcp",
2343
protocol = protocol, bus = bus)
1875
service = AvahiService(name = server_settings["servicename"],
1876
servicetype = "_mandos._tcp",
1877
protocol = protocol, bus = bus)
2344
1878
if server_settings["interface"]:
2345
1879
service.interface = (if_nametoindex
2346
1880
(str(server_settings["interface"])))
2351
1885
client_class = Client
2352
1886
if use_dbus:
2353
1887
client_class = functools.partial(ClientDBus, bus = bus)
2354
2355
client_settings = Client.config_parser(client_config)
2356
old_client_settings = {}
2357
clients_data = {}
2358
2359
# Get client data and settings from last running state.
2360
if server_settings["restore"]:
2361
try:
2362
with open(stored_state_path, "rb") as stored_state:
2363
clients_data, old_client_settings = (pickle.load
2364
(stored_state))
2365
os.remove(stored_state_path)
2366
except IOError as e:
2367
if e.errno == errno.ENOENT:
2368
logger.warning("Could not load persistent state: {0}"
2369
.format(os.strerror(e.errno)))
2370
else:
2371
logger.critical("Could not load persistent state:",
2372
exc_info=e)
2373
raise
2374
except EOFError as e:
2375
logger.warning("Could not load persistent state: "
2376
"EOFError:", exc_info=e)
2377
2378
with PGPEngine() as pgp:
2379
for client_name, client in clients_data.iteritems():
2380
# Decide which value to use after restoring saved state.
2381
# We have three different values: Old config file,
2382
# new config file, and saved state.
2383
# New config value takes precedence if it differs from old
2384
# config value, otherwise use saved state.
2385
for name, value in client_settings[client_name].items():
2386
try:
2387
# For each value in new config, check if it
2388
# differs from the old config value (Except for
2389
# the "secret" attribute)
2390
if (name != "secret" and
2391
value != old_client_settings[client_name]
2392
[name]):
2393
client[name] = value
2394
except KeyError:
2395
pass
2396
2397
# Clients who has passed its expire date can still be
2398
# enabled if its last checker was successful. Clients
2399
# whose checker succeeded before we stored its state is
2400
# assumed to have successfully run all checkers during
2401
# downtime.
2402
if client["enabled"]:
2403
if datetime.datetime.utcnow() >= client["expires"]:
2404
if not client["last_checked_ok"]:
2405
logger.warning(
2406
"disabling client {0} - Client never "
2407
"performed a successful checker"
2408
.format(client_name))
2409
client["enabled"] = False
2410
elif client["last_checker_status"] != 0:
2411
logger.warning(
2412
"disabling client {0} - Client "
2413
"last checker failed with error code {1}"
2414
.format(client_name,
2415
client["last_checker_status"]))
2416
client["enabled"] = False
2417
else:
2418
client["expires"] = (datetime.datetime
2419
.utcnow()
2420
+ client["timeout"])
2421
logger.debug("Last checker succeeded,"
2422
" keeping {0} enabled"
2423
.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):
2424
1895
try:
2425
client["secret"] = (
2426
pgp.decrypt(client["encrypted_secret"],
2427
client_settings[client_name]
2428
["secret"]))
2429
except PGPError:
2430
# If decryption fails, we use secret from new settings
2431
logger.debug("Failed to decrypt {0} old secret"
2432
.format(client_name))
2433
client["secret"] = (
2434
client_settings[client_name]["secret"])
2435
2436
# Add/remove clients based on new changes made to config
2437
for client_name in (set(old_client_settings)
2438
- set(client_settings)):
2439
del clients_data[client_name]
2440
for client_name in (set(client_settings)
2441
- set(old_client_settings)):
2442
clients_data[client_name] = client_settings[client_name]
2443
2444
# Create all client objects
2445
for client_name, client in clients_data.iteritems():
2446
tcp_server.clients[client_name] = client_class(
2447
name = client_name, settings = client)
2448
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()))
2449
1905
if not tcp_server.clients:
2450
1906
logger.warning("No clients defined")
2451
1907
2452
1908
if not debug:
2453
1909
try:
2454
1910
with pidfile:
2462
1918
# "pidfile" was never created
2463
1919
pass
2464
1920
del pidfilename
1921
2465
1922
signal.signal(signal.SIGINT, signal.SIG_IGN)
2466
1923
2467
1924
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2468
1925
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2469
1926
2470
1927
if use_dbus:
2471
@alternate_dbus_interfaces({"se.recompile.Mandos":
2472
"se.bsnet.fukt.Mandos"})
2473
class MandosDBusService(DBusObjectWithProperties):
1928
class MandosDBusService(dbus.service.Object):
2474
1929
"""A D-Bus proxy object"""
2475
1930
def __init__(self):
2476
1931
dbus.service.Object.__init__(self, bus, "/")
2477
_interface = "se.recompile.Mandos"
2478
2479
@dbus_interface_annotations(_interface)
2480
def _foo(self):
2481
return { "org.freedesktop.DBus.Property"
2482
".EmitsChangedSignal":
2483
"false"}
1932
_interface = "se.bsnet.fukt.Mandos"
2484
1933
2485
1934
@dbus.service.signal(_interface, signature="o")
2486
1935
def ClientAdded(self, objpath):
2501
1950
def GetAllClients(self):
2502
1951
"D-Bus method"
2503
1952
return dbus.Array(c.dbus_object_path
2504
for c in
2505
tcp_server.clients.itervalues())
1953
for c in tcp_server.clients)
2506
1954
2507
1955
@dbus.service.method(_interface,
2508
1956
out_signature="a{oa{sv}}")
2510
1958
"D-Bus method"
2511
1959
return dbus.Dictionary(
2512
1960
((c.dbus_object_path, c.GetAll(""))
2513
for c in tcp_server.clients.itervalues()),
1961
for c in tcp_server.clients),
2514
1962
signature="oa{sv}")
2515
1963
2516
1964
@dbus.service.method(_interface, in_signature="o")
2517
1965
def RemoveClient(self, object_path):
2518
1966
"D-Bus method"
2519
for c in tcp_server.clients.itervalues():
1967
for c in tcp_server.clients:
2520
1968
if c.dbus_object_path == object_path:
2521
del tcp_server.clients[c.name]
1969
tcp_server.clients.remove(c)
2522
1970
c.remove_from_connection()
2523
1971
# Don't signal anything except ClientRemoved
2524
1972
c.disable(quiet=True)
2535
1983
"Cleanup function; run on exit"
2536
1984
service.cleanup()
2537
1985
2538
multiprocessing.active_children()
2539
if not (tcp_server.clients or client_settings):
2540
return
2541
2542
# Store client before exiting. Secrets are encrypted with key
2543
# based on what config file has. If config file is
2544
# removed/edited, old secret will thus be unrecovable.
2545
clients = {}
2546
with PGPEngine() as pgp:
2547
for client in tcp_server.clients.itervalues():
2548
key = client_settings[client.name]["secret"]
2549
client.encrypted_secret = pgp.encrypt(client.secret,
2550
key)
2551
client_dict = {}
2552
2553
# A list of attributes that can not be pickled
2554
# + secret.
2555
exclude = set(("bus", "changedstate", "secret",
2556
"checker"))
2557
for name, typ in (inspect.getmembers
2558
(dbus.service.Object)):
2559
exclude.add(name)
2560
2561
client_dict["encrypted_secret"] = (client
2562
.encrypted_secret)
2563
for attr in client.client_structure:
2564
if attr not in exclude:
2565
client_dict[attr] = getattr(client, attr)
2566
2567
clients[client.name] = client_dict
2568
del client_settings[client.name]["secret"]
2569
2570
try:
2571
with (tempfile.NamedTemporaryFile
2572
(mode='wb', suffix=".pickle", prefix='clients-',
2573
dir=os.path.dirname(stored_state_path),
2574
delete=False)) as stored_state:
2575
pickle.dump((clients, client_settings), stored_state)
2576
tempname=stored_state.name
2577
os.rename(tempname, stored_state_path)
2578
except (IOError, OSError) as e:
2579
if not debug:
2580
try:
2581
os.remove(tempname)
2582
except NameError:
2583
pass
2584
if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2585
logger.warning("Could not save persistent state: {0}"
2586
.format(os.strerror(e.errno)))
2587
else:
2588
logger.warning("Could not save persistent state:",
2589
exc_info=e)
2590
raise e
2591
2592
# Delete all clients, and settings from config
2593
1986
while tcp_server.clients:
2594
name, client = tcp_server.clients.popitem()
1987
client = tcp_server.clients.pop()
2595
1988
if use_dbus:
2596
1989
client.remove_from_connection()
1990
client.disable_hook = None
2597
1991
# Don't signal anything except ClientRemoved
2598
1992
client.disable(quiet=True)
2599
1993
if use_dbus:
2600
1994
# Emit D-Bus signal
2601
mandos_dbus_service.ClientRemoved(client
2602
.dbus_object_path,
1995
mandos_dbus_service.ClientRemoved(client.dbus_object_path,
2603
1996
client.name)
2604
client_settings.clear()
2605
1997
2606
1998
atexit.register(cleanup)
2607
1999
2608
for client in tcp_server.clients.itervalues():
2000
for client in tcp_server.clients:
2609
2001
if use_dbus:
2610
2002
# Emit D-Bus signal
2611
2003
mandos_dbus_service.ClientAdded(client.dbus_object_path)
2612
# Need to initiate checking of clients
2613
if client.enabled:
2614
client.init_checker()
2004
client.enable()
2615
2005
2616
2006
tcp_server.enable()
2617
2007
tcp_server.server_activate()
2620
2010
service.port = tcp_server.socket.getsockname()[1]
2621
2011
if use_ipv6:
2622
2012
logger.info("Now listening on address %r, port %d,"
2623
" flowinfo %d, scope_id %d",
2624
*tcp_server.socket.getsockname())
2013
" flowinfo %d, scope_id %d"
2014
% tcp_server.socket.getsockname())
2625
2015
else: # IPv4
2626
logger.info("Now listening on address %r, port %d",
2627
*tcp_server.socket.getsockname())
2016
logger.info("Now listening on address %r, port %d"
2017
% tcp_server.socket.getsockname())
2628
2018
2629
2019
#service.interface = tcp_server.socket.getsockname()[3]
2630
2020
2632
2022
# From the Avahi example code
2633
2023
try:
2634
2024
service.activate()
2635
except dbus.exceptions.DBusException as error:
2636
logger.critical("D-Bus Exception", exc_info=error)
2025
except dbus.exceptions.DBusException, error:
2026
logger.critical("DBusException: %s", error)
2637
2027
cleanup()
2638
2028
sys.exit(1)
2639
2029
# End of Avahi example code
2645
2035
2646
2036
logger.debug("Starting main loop")
2647
2037
main_loop.run()
2648
except AvahiError as error:
2649
logger.critical("Avahi Error", exc_info=error)
2038
except AvahiError, error:
2039
logger.critical("AvahiError: %s", error)
2650
2040
cleanup()
2651
2041
sys.exit(1)
2652
2042
except KeyboardInterrupt:
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0