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