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