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