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