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