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