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