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