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 466
- compare with another revision
- download diff
- download tarball
- view history from revision 466
- Committer: Teddy Hogeborn
- Date: 2011-02-27 17:26:35 UTC
- Revision ID: teddy@fukt.bsnet.se-20110227172635-hw1sire7k3vuo1co
Update copyright year to "2011" wherever appropriate.
- files removed:
- debian/source/local-options
- network-hooks.d
- files modified:
- DBUS-API
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,
36
36
37
37
import SocketServer as socketserver
38
38
import socket
39
import argparse
39
import optparse
40
40
import datetime
41
41
import errno
42
42
import gnutls.crypto
62
62
import functools
63
63
import cPickle as pickle
64
64
import multiprocessing
65
import types
66
import binascii
67
import tempfile
68
65
69
66
import dbus
70
67
import dbus.service
75
72
import ctypes.util
76
73
import xml.dom.minidom
77
74
import inspect
78
import GnuPGInterface
79
75
80
76
try:
81
77
SO_BINDTODEVICE = socket.SO_BINDTODEVICE
85
81
except ImportError:
86
82
SO_BINDTODEVICE = None
87
83
88
version = "1.5.0"
89
stored_state_file = "clients.pickle"
90
91
logger = logging.getLogger()
84
85
version = "1.2.3"
86
87
#logger = logging.getLogger('mandos')
88
logger = logging.Logger('mandos')
92
89
syslogger = (logging.handlers.SysLogHandler
93
90
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
94
91
address = str("/dev/log")))
95
96
try:
97
if_nametoindex = (ctypes.cdll.LoadLibrary
98
(ctypes.util.find_library("c"))
99
.if_nametoindex)
100
except (OSError, AttributeError):
101
def if_nametoindex(interface):
102
"Get an interface index the hard way, i.e. using fcntl()"
103
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
104
with contextlib.closing(socket.socket()) as s:
105
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
106
struct.pack(str("16s16x"),
107
interface))
108
interface_index = struct.unpack(str("I"),
109
ifreq[16:20])[0]
110
return interface_index
111
112
113
def initlogger(debug, level=logging.WARNING):
114
"""init logger and add loglevel"""
115
116
syslogger.setFormatter(logging.Formatter
117
('Mandos [%(process)d]: %(levelname)s:'
118
' %(message)s'))
119
logger.addHandler(syslogger)
120
121
if debug:
122
console = logging.StreamHandler()
123
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
124
' [%(process)d]:'
125
' %(levelname)s:'
126
' %(message)s'))
127
logger.addHandler(console)
128
logger.setLevel(level)
129
130
131
class PGPError(Exception):
132
"""Exception if encryption/decryption fails"""
133
pass
134
135
136
class PGPEngine(object):
137
"""A simple class for OpenPGP symmetric encryption & decryption"""
138
def __init__(self):
139
self.gnupg = GnuPGInterface.GnuPG()
140
self.tempdir = tempfile.mkdtemp(prefix="mandos-")
141
self.gnupg = GnuPGInterface.GnuPG()
142
self.gnupg.options.meta_interactive = False
143
self.gnupg.options.homedir = self.tempdir
144
self.gnupg.options.extra_args.extend(['--force-mdc',
145
'--quiet',
146
'--no-use-agent'])
147
148
def __enter__(self):
149
return self
150
151
def __exit__ (self, exc_type, exc_value, traceback):
152
self._cleanup()
153
return False
154
155
def __del__(self):
156
self._cleanup()
157
158
def _cleanup(self):
159
if self.tempdir is not None:
160
# Delete contents of tempdir
161
for root, dirs, files in os.walk(self.tempdir,
162
topdown = False):
163
for filename in files:
164
os.remove(os.path.join(root, filename))
165
for dirname in dirs:
166
os.rmdir(os.path.join(root, dirname))
167
# Remove tempdir
168
os.rmdir(self.tempdir)
169
self.tempdir = None
170
171
def password_encode(self, password):
172
# Passphrase can not be empty and can not contain newlines or
173
# NUL bytes. So we prefix it and hex encode it.
174
return b"mandos" + binascii.hexlify(password)
175
176
def encrypt(self, data, password):
177
self.gnupg.passphrase = self.password_encode(password)
178
with open(os.devnull) as devnull:
179
try:
180
proc = self.gnupg.run(['--symmetric'],
181
create_fhs=['stdin', 'stdout'],
182
attach_fhs={'stderr': devnull})
183
with contextlib.closing(proc.handles['stdin']) as f:
184
f.write(data)
185
with contextlib.closing(proc.handles['stdout']) as f:
186
ciphertext = f.read()
187
proc.wait()
188
except IOError as e:
189
raise PGPError(e)
190
self.gnupg.passphrase = None
191
return ciphertext
192
193
def decrypt(self, data, password):
194
self.gnupg.passphrase = self.password_encode(password)
195
with open(os.devnull) as devnull:
196
try:
197
proc = self.gnupg.run(['--decrypt'],
198
create_fhs=['stdin', 'stdout'],
199
attach_fhs={'stderr': devnull})
200
with contextlib.closing(proc.handles['stdin'] ) as f:
201
f.write(data)
202
with contextlib.closing(proc.handles['stdout']) as f:
203
decrypted_plaintext = f.read()
204
proc.wait()
205
except IOError as e:
206
raise PGPError(e)
207
self.gnupg.passphrase = None
208
return decrypted_plaintext
209
210
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)
211
102
212
103
class AvahiError(Exception):
213
104
def __init__(self, value, *args, **kwargs):
260
151
self.group = None # our entry group
261
152
self.server = None
262
153
self.bus = bus
263
self.entry_group_state_changed_match = None
264
154
def rename(self):
265
155
"""Derived from the Avahi example code"""
266
156
if self.rename_count >= self.max_renames:
268
158
" after %i retries, exiting.",
269
159
self.rename_count)
270
160
raise AvahiServiceError("Too many renames")
271
self.name = unicode(self.server
272
.GetAlternativeServiceName(self.name))
161
self.name = unicode(self.server.GetAlternativeServiceName(self.name))
273
162
logger.info("Changing Zeroconf service name to %r ...",
274
163
self.name)
164
syslogger.setFormatter(logging.Formatter
165
('Mandos (%s) [%%(process)d]:'
166
' %%(levelname)s: %%(message)s'
167
% self.name))
275
168
self.remove()
276
169
try:
277
170
self.add()
278
except dbus.exceptions.DBusException as error:
171
except dbus.exceptions.DBusException, error:
279
172
logger.critical("DBusException: %s", error)
280
173
self.cleanup()
281
174
os._exit(1)
282
175
self.rename_count += 1
283
176
def remove(self):
284
177
"""Derived from the Avahi example code"""
285
if self.entry_group_state_changed_match is not None:
286
self.entry_group_state_changed_match.remove()
287
self.entry_group_state_changed_match = None
288
178
if self.group is not None:
289
179
self.group.Reset()
290
180
def add(self):
291
181
"""Derived from the Avahi example code"""
292
self.remove()
293
182
if self.group is None:
294
183
self.group = dbus.Interface(
295
184
self.bus.get_object(avahi.DBUS_NAME,
296
185
self.server.EntryGroupNew()),
297
186
avahi.DBUS_INTERFACE_ENTRY_GROUP)
298
self.entry_group_state_changed_match = (
299
self.group.connect_to_signal(
300
'StateChanged', self.entry_group_state_changed))
187
self.group.connect_to_signal('StateChanged',
188
self
189
.entry_group_state_changed)
301
190
logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
302
191
self.name, self.type)
303
192
self.group.AddService(
326
215
def cleanup(self):
327
216
"""Derived from the Avahi example code"""
328
217
if self.group is not None:
329
try:
330
self.group.Free()
331
except (dbus.exceptions.UnknownMethodException,
332
dbus.exceptions.DBusException):
333
pass
218
self.group.Free()
334
219
self.group = None
335
self.remove()
336
def server_state_changed(self, state, error=None):
220
def server_state_changed(self, state):
337
221
"""Derived from the Avahi example code"""
338
222
logger.debug("Avahi server state change: %i", state)
339
bad_states = { avahi.SERVER_INVALID:
340
"Zeroconf server invalid",
341
avahi.SERVER_REGISTERING: None,
342
avahi.SERVER_COLLISION:
343
"Zeroconf server name collision",
344
avahi.SERVER_FAILURE:
345
"Zeroconf server failure" }
346
if state in bad_states:
347
if bad_states[state] is not None:
348
if error is None:
349
logger.error(bad_states[state])
350
else:
351
logger.error(bad_states[state] + ": %r", error)
352
self.cleanup()
223
if state == avahi.SERVER_COLLISION:
224
logger.error("Zeroconf server name collision")
225
self.remove()
353
226
elif state == avahi.SERVER_RUNNING:
354
227
self.add()
355
else:
356
if error is None:
357
logger.debug("Unknown state: %r", state)
358
else:
359
logger.debug("Unknown state: %r: %r", state, error)
360
228
def activate(self):
361
229
"""Derived from the Avahi example code"""
362
230
if self.server is None:
363
231
self.server = dbus.Interface(
364
232
self.bus.get_object(avahi.DBUS_NAME,
365
avahi.DBUS_PATH_SERVER,
366
follow_name_owner_changes=True),
233
avahi.DBUS_PATH_SERVER),
367
234
avahi.DBUS_INTERFACE_SERVER)
368
235
self.server.connect_to_signal("StateChanged",
369
236
self.server_state_changed)
370
237
self.server_state_changed(self.server.GetState())
371
238
372
class AvahiServiceToSyslog(AvahiService):
373
def rename(self):
374
"""Add the new name to the syslog messages"""
375
ret = AvahiService.rename(self)
376
syslogger.setFormatter(logging.Formatter
377
('Mandos (%s) [%%(process)d]:'
378
' %%(levelname)s: %%(message)s'
379
% self.name))
380
return ret
381
239
382
def timedelta_to_milliseconds(td):
383
"Convert a datetime.timedelta() to milliseconds"
384
return ((td.days * 24 * 60 * 60 * 1000)
385
+ (td.seconds * 1000)
386
+ (td.microseconds // 1000))
387
388
240
class Client(object):
389
241
"""A representation of a client host served by this server.
390
242
391
243
Attributes:
392
approved: bool(); 'None' if not yet approved/disapproved
244
_approved: bool(); 'None' if not yet approved/disapproved
393
245
approval_delay: datetime.timedelta(); Time to wait for approval
394
246
approval_duration: datetime.timedelta(); Duration of one approval
395
247
checker: subprocess.Popen(); a running checker process used
402
254
instance %(name)s can be used in the command.
403
255
checker_initiator_tag: a gobject event source tag, or None
404
256
created: datetime.datetime(); (UTC) object creation
405
client_structure: Object describing what attributes a client has
406
and is used for storing the client at exit
407
257
current_checker_command: string; current running checker_command
258
disable_hook: If set, called by disable() as disable_hook(self)
408
259
disable_initiator_tag: a gobject event source tag, or None
409
260
enabled: bool()
410
261
fingerprint: string (40 or 32 hexadecimal digits); used to
413
264
interval: datetime.timedelta(); How often to start a new checker
414
265
last_approval_request: datetime.datetime(); (UTC) or None
415
266
last_checked_ok: datetime.datetime(); (UTC) or None
416
last_checker_status: integer between 0 and 255 reflecting exit
417
status of last checker. -1 reflects crashed
418
checker, or None.
419
last_enabled: datetime.datetime(); (UTC) or None
267
last_enabled: datetime.datetime(); (UTC)
420
268
name: string; from the config file, used in log messages and
421
269
D-Bus identifiers
422
270
secret: bytestring; sent verbatim (over TLS) to client
423
271
timeout: datetime.timedelta(); How long from last_checked_ok
424
272
until this client is disabled
425
extended_timeout: extra long timeout when password has been sent
426
273
runtime_expansions: Allowed attributes for runtime expansion.
427
expires: datetime.datetime(); time (UTC) when a client will be
428
disabled, or None
429
274
"""
430
275
431
276
runtime_expansions = ("approval_delay", "approval_duration",
432
277
"created", "enabled", "fingerprint",
433
278
"host", "interval", "last_checked_ok",
434
279
"last_enabled", "name", "timeout")
435
client_defaults = { "timeout": "5m",
436
"extended_timeout": "15m",
437
"interval": "2m",
438
"checker": "fping -q -- %%(host)s",
439
"host": "",
440
"approval_delay": "0s",
441
"approval_duration": "1s",
442
"approved_by_default": "True",
443
"enabled": "True",
444
}
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))
445
287
446
288
def timeout_milliseconds(self):
447
289
"Return the 'timeout' attribute in milliseconds"
448
return timedelta_to_milliseconds(self.timeout)
449
450
def extended_timeout_milliseconds(self):
451
"Return the 'extended_timeout' attribute in milliseconds"
452
return timedelta_to_milliseconds(self.extended_timeout)
290
return self._timedelta_to_milliseconds(self.timeout)
453
291
454
292
def interval_milliseconds(self):
455
293
"Return the 'interval' attribute in milliseconds"
456
return timedelta_to_milliseconds(self.interval)
457
294
return self._timedelta_to_milliseconds(self.interval)
295
458
296
def approval_delay_milliseconds(self):
459
return timedelta_to_milliseconds(self.approval_delay)
460
461
@staticmethod
462
def config_parser(config):
463
"""Construct a new dict of client settings of this form:
464
{ client_name: {setting_name: value, ...}, ...}
465
with exceptions for any special settings as defined above.
466
NOTE: Must be a pure function. Must return the same result
467
value given the same arguments.
468
"""
469
settings = {}
470
for client_name in config.sections():
471
section = dict(config.items(client_name))
472
client = settings[client_name] = {}
473
474
client["host"] = section["host"]
475
# Reformat values from string types to Python types
476
client["approved_by_default"] = config.getboolean(
477
client_name, "approved_by_default")
478
client["enabled"] = config.getboolean(client_name,
479
"enabled")
480
481
client["fingerprint"] = (section["fingerprint"].upper()
482
.replace(" ", ""))
483
if "secret" in section:
484
client["secret"] = section["secret"].decode("base64")
485
elif "secfile" in section:
486
with open(os.path.expanduser(os.path.expandvars
487
(section["secfile"])),
488
"rb") as secfile:
489
client["secret"] = secfile.read()
490
else:
491
raise TypeError("No secret or secfile for section %s"
492
% section)
493
client["timeout"] = string_to_delta(section["timeout"])
494
client["extended_timeout"] = string_to_delta(
495
section["extended_timeout"])
496
client["interval"] = string_to_delta(section["interval"])
497
client["approval_delay"] = string_to_delta(
498
section["approval_delay"])
499
client["approval_duration"] = string_to_delta(
500
section["approval_duration"])
501
client["checker_command"] = section["checker"]
502
client["last_approval_request"] = None
503
client["last_checked_ok"] = None
504
client["last_checker_status"] = None
505
506
return settings
507
508
509
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):
510
300
"""Note: the 'checker' key in 'config' sets the
511
301
'checker_command' attribute and *not* the 'checker'
512
302
attribute."""
513
303
self.name = name
514
# adding all client settings
515
for setting, value in settings.iteritems():
516
setattr(self, setting, value)
517
518
if self.enabled:
519
if not hasattr(self, "last_enabled"):
520
self.last_enabled = datetime.datetime.utcnow()
521
if not hasattr(self, "expires"):
522
self.expires = (datetime.datetime.utcnow()
523
+ self.timeout)
524
else:
525
self.last_enabled = None
526
self.expires = None
527
304
if config is None:
305
config = {}
528
306
logger.debug("Creating client %r", self.name)
529
307
# Uppercase and remove spaces from fingerprint for later
530
308
# comparison purposes with return value from the fingerprint()
531
309
# function
310
self.fingerprint = (config["fingerprint"].upper()
311
.replace(" ", ""))
532
312
logger.debug(" Fingerprint: %s", self.fingerprint)
533
self.created = settings.get("created",
534
datetime.datetime.utcnow())
535
536
# 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
537
332
self.checker = None
538
333
self.checker_initiator_tag = None
539
334
self.disable_initiator_tag = None
540
335
self.checker_callback_tag = None
336
self.checker_command = config["checker"]
541
337
self.current_checker_command = None
542
self.approved = None
338
self.last_connect = None
339
self._approved = None
340
self.approved_by_default = config.get("approved_by_default",
341
True)
543
342
self.approvals_pending = 0
544
self.changedstate = (multiprocessing_manager
545
.Condition(multiprocessing_manager
546
.Lock()))
547
self.client_structure = [attr for attr in
548
self.__dict__.iterkeys()
549
if not attr.startswith("_")]
550
self.client_structure.append("client_structure")
551
552
for name, t in inspect.getmembers(type(self),
553
lambda obj:
554
isinstance(obj,
555
property)):
556
if not name.startswith("_"):
557
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())
558
348
559
# Send notice to process children that client state has changed
560
349
def send_changedstate(self):
561
with self.changedstate:
562
self.changedstate.notify_all()
563
350
self.changedstate.acquire()
351
self.changedstate.notify_all()
352
self.changedstate.release()
353
564
354
def enable(self):
565
355
"""Start this client's checker and timeout hooks"""
566
356
if getattr(self, "enabled", False):
567
357
# Already enabled
568
358
return
569
359
self.send_changedstate()
570
self.expires = datetime.datetime.utcnow() + self.timeout
571
self.enabled = True
572
360
self.last_enabled = datetime.datetime.utcnow()
573
self.init_checker()
361
# Schedule a new checker to be started an 'interval' from now,
362
# and every interval from then on.
363
self.checker_initiator_tag = (gobject.timeout_add
364
(self.interval_milliseconds(),
365
self.start_checker))
366
# Schedule a disable() when 'timeout' has passed
367
self.disable_initiator_tag = (gobject.timeout_add
368
(self.timeout_milliseconds(),
369
self.disable))
370
self.enabled = True
371
# Also start a new checker *right now*.
372
self.start_checker()
574
373
575
374
def disable(self, quiet=True):
576
375
"""Disable this client."""
583
382
if getattr(self, "disable_initiator_tag", False):
584
383
gobject.source_remove(self.disable_initiator_tag)
585
384
self.disable_initiator_tag = None
586
self.expires = None
587
385
if getattr(self, "checker_initiator_tag", False):
588
386
gobject.source_remove(self.checker_initiator_tag)
589
387
self.checker_initiator_tag = None
590
388
self.stop_checker()
389
if self.disable_hook:
390
self.disable_hook(self)
591
391
self.enabled = False
592
392
# Do not run this again if called by a gobject.timeout_add
593
393
return False
594
394
595
395
def __del__(self):
396
self.disable_hook = None
596
397
self.disable()
597
398
598
def init_checker(self):
599
# Schedule a new checker to be started an 'interval' from now,
600
# and every interval from then on.
601
self.checker_initiator_tag = (gobject.timeout_add
602
(self.interval_milliseconds(),
603
self.start_checker))
604
# Schedule a disable() when 'timeout' has passed
605
self.disable_initiator_tag = (gobject.timeout_add
606
(self.timeout_milliseconds(),
607
self.disable))
608
# Also start a new checker *right now*.
609
self.start_checker()
610
611
399
def checker_callback(self, pid, condition, command):
612
400
"""The checker has completed, so take appropriate actions."""
613
401
self.checker_callback_tag = None
614
402
self.checker = None
615
403
if os.WIFEXITED(condition):
616
self.last_checker_status = os.WEXITSTATUS(condition)
617
if self.last_checker_status == 0:
404
exitstatus = os.WEXITSTATUS(condition)
405
if exitstatus == 0:
618
406
logger.info("Checker for %(name)s succeeded",
619
407
vars(self))
620
408
self.checked_ok()
622
410
logger.info("Checker for %(name)s failed",
623
411
vars(self))
624
412
else:
625
self.last_checker_status = -1
626
413
logger.warning("Checker for %(name)s crashed?",
627
414
vars(self))
628
415
629
def checked_ok(self, timeout=None):
416
def checked_ok(self):
630
417
"""Bump up the timeout for this client.
631
418
632
419
This should only be called when the client has been seen,
633
420
alive and well.
634
421
"""
635
if timeout is None:
636
timeout = self.timeout
637
422
self.last_checked_ok = datetime.datetime.utcnow()
638
if self.disable_initiator_tag is not None:
639
gobject.source_remove(self.disable_initiator_tag)
640
if getattr(self, "enabled", False):
641
self.disable_initiator_tag = (gobject.timeout_add
642
(timedelta_to_milliseconds
643
(timeout), self.disable))
644
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))
645
427
646
428
def need_approval(self):
647
429
self.last_approval_request = datetime.datetime.utcnow()
663
445
# If a checker exists, make sure it is not a zombie
664
446
try:
665
447
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
666
except (AttributeError, OSError) as error:
448
except (AttributeError, OSError), error:
667
449
if (isinstance(error, OSError)
668
450
and error.errno != errno.ECHILD):
669
451
raise error
687
469
'replace')))
688
470
for attr in
689
471
self.runtime_expansions)
690
472
691
473
try:
692
474
command = self.checker_command % escaped_attrs
693
except TypeError as error:
475
except TypeError, error:
694
476
logger.error('Could not format string "%s":'
695
477
' %s', self.checker_command, error)
696
478
return True # Try again later
715
497
if pid:
716
498
gobject.source_remove(self.checker_callback_tag)
717
499
self.checker_callback(pid, status, command)
718
except OSError as error:
500
except OSError, error:
719
501
logger.error("Failed to start subprocess: %s",
720
502
error)
721
503
# Re-run this periodically if run by gobject.timeout_add
734
516
#time.sleep(0.5)
735
517
#if self.checker.poll() is None:
736
518
# os.kill(self.checker.pid, signal.SIGKILL)
737
except OSError as error:
519
except OSError, error:
738
520
if error.errno != errno.ESRCH: # No such process
739
521
raise
740
522
self.checker = None
741
523
742
743
524
def dbus_service_property(dbus_interface, signature="v",
744
525
access="readwrite", byte_arrays=False):
745
526
"""Decorators for marking methods of a DBusObjectWithProperties to
791
572
792
573
class DBusObjectWithProperties(dbus.service.Object):
793
574
"""A D-Bus object with properties.
794
575
795
576
Classes inheriting from this can use the dbus_service_property
796
577
decorator to expose methods as D-Bus properties. It exposes the
797
578
standard Get(), Set(), and GetAll() methods on the D-Bus.
804
585
def _get_all_dbus_properties(self):
805
586
"""Returns a generator of (name, attribute) pairs
806
587
"""
807
return ((prop.__get__(self)._dbus_name, prop.__get__(self))
808
for cls in self.__class__.__mro__
588
return ((prop._dbus_name, prop)
809
589
for name, prop in
810
inspect.getmembers(cls, self._is_dbus_property))
590
inspect.getmembers(self, self._is_dbus_property))
811
591
812
592
def _get_dbus_property(self, interface_name, property_name):
813
593
"""Returns a bound method if one exists which is a D-Bus
814
594
property with the specified name and interface.
815
595
"""
816
for cls in self.__class__.__mro__:
817
for name, value in (inspect.getmembers
818
(cls, self._is_dbus_property)):
819
if (value._dbus_name == property_name
820
and value._dbus_interface == interface_name):
821
return value.__get__(self)
822
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
823
606
# No such property
824
607
raise DBusPropertyNotFound(self.dbus_object_path + ":"
825
608
+ interface_name + "."
850
633
# signatures other than "ay".
851
634
if prop._dbus_signature != "ay":
852
635
raise ValueError
853
value = dbus.ByteArray(b''.join(chr(byte)
854
for byte in value))
636
value = dbus.ByteArray(''.join(unichr(byte)
637
for byte in value))
855
638
prop(value)
856
639
857
640
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
859
642
def GetAll(self, interface_name):
860
643
"""Standard D-Bus property GetAll() method, see D-Bus
861
644
standard.
862
645
863
646
Note: Will not include properties with access="write".
864
647
"""
865
properties = {}
648
all = {}
866
649
for name, prop in self._get_all_dbus_properties():
867
650
if (interface_name
868
651
and interface_name != prop._dbus_interface):
873
656
continue
874
657
value = prop()
875
658
if not hasattr(value, "variant_level"):
876
properties[name] = value
659
all[name] = value
877
660
continue
878
properties[name] = type(value)(value, variant_level=
879
value.variant_level+1)
880
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")
881
664
882
665
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
883
666
out_signature="s",
921
704
xmlstring = document.toxml("utf-8")
922
705
document.unlink()
923
706
except (AttributeError, xml.dom.DOMException,
924
xml.parsers.expat.ExpatError) as error:
707
xml.parsers.expat.ExpatError), error:
925
708
logger.error("Failed to override Introspection method",
926
709
error)
927
710
return xmlstring
928
711
929
712
930
def datetime_to_dbus (dt, variant_level=0):
931
"""Convert a UTC datetime.datetime() to a D-Bus type."""
932
if dt is None:
933
return dbus.String("", variant_level = variant_level)
934
return dbus.String(dt.isoformat(),
935
variant_level=variant_level)
936
937
938
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
939
.__metaclass__):
940
"""Applied to an empty subclass of a D-Bus object, this metaclass
941
will add additional D-Bus attributes matching a certain pattern.
942
"""
943
def __new__(mcs, name, bases, attr):
944
# Go through all the base classes which could have D-Bus
945
# methods, signals, or properties in them
946
for base in (b for b in bases
947
if issubclass(b, dbus.service.Object)):
948
# Go though all attributes of the base class
949
for attrname, attribute in inspect.getmembers(base):
950
# Ignore non-D-Bus attributes, and D-Bus attributes
951
# with the wrong interface name
952
if (not hasattr(attribute, "_dbus_interface")
953
or not attribute._dbus_interface
954
.startswith("se.recompile.Mandos")):
955
continue
956
# Create an alternate D-Bus interface name based on
957
# the current name
958
alt_interface = (attribute._dbus_interface
959
.replace("se.recompile.Mandos",
960
"se.bsnet.fukt.Mandos"))
961
# Is this a D-Bus signal?
962
if getattr(attribute, "_dbus_is_signal", False):
963
# Extract the original non-method function by
964
# black magic
965
nonmethod_func = (dict(
966
zip(attribute.func_code.co_freevars,
967
attribute.__closure__))["func"]
968
.cell_contents)
969
# Create a new, but exactly alike, function
970
# object, and decorate it to be a new D-Bus signal
971
# with the alternate D-Bus interface name
972
new_function = (dbus.service.signal
973
(alt_interface,
974
attribute._dbus_signature)
975
(types.FunctionType(
976
nonmethod_func.func_code,
977
nonmethod_func.func_globals,
978
nonmethod_func.func_name,
979
nonmethod_func.func_defaults,
980
nonmethod_func.func_closure)))
981
# Define a creator of a function to call both the
982
# old and new functions, so both the old and new
983
# signals gets sent when the function is called
984
def fixscope(func1, func2):
985
"""This function is a scope container to pass
986
func1 and func2 to the "call_both" function
987
outside of its arguments"""
988
def call_both(*args, **kwargs):
989
"""This function will emit two D-Bus
990
signals by calling func1 and func2"""
991
func1(*args, **kwargs)
992
func2(*args, **kwargs)
993
return call_both
994
# Create the "call_both" function and add it to
995
# the class
996
attr[attrname] = fixscope(attribute,
997
new_function)
998
# Is this a D-Bus method?
999
elif getattr(attribute, "_dbus_is_method", False):
1000
# Create a new, but exactly alike, function
1001
# object. Decorate it to be a new D-Bus method
1002
# with the alternate D-Bus interface name. Add it
1003
# to the class.
1004
attr[attrname] = (dbus.service.method
1005
(alt_interface,
1006
attribute._dbus_in_signature,
1007
attribute._dbus_out_signature)
1008
(types.FunctionType
1009
(attribute.func_code,
1010
attribute.func_globals,
1011
attribute.func_name,
1012
attribute.func_defaults,
1013
attribute.func_closure)))
1014
# Is this a D-Bus property?
1015
elif getattr(attribute, "_dbus_is_property", False):
1016
# Create a new, but exactly alike, function
1017
# object, and decorate it to be a new D-Bus
1018
# property with the alternate D-Bus interface
1019
# name. Add it to the class.
1020
attr[attrname] = (dbus_service_property
1021
(alt_interface,
1022
attribute._dbus_signature,
1023
attribute._dbus_access,
1024
attribute
1025
._dbus_get_args_options
1026
["byte_arrays"])
1027
(types.FunctionType
1028
(attribute.func_code,
1029
attribute.func_globals,
1030
attribute.func_name,
1031
attribute.func_defaults,
1032
attribute.func_closure)))
1033
return type.__new__(mcs, name, bases, attr)
1034
1035
1036
713
class ClientDBus(Client, DBusObjectWithProperties):
1037
714
"""A Client class using D-Bus
1038
715
1047
724
# dbus.service.Object doesn't use super(), so we can't either.
1048
725
1049
726
def __init__(self, bus = None, *args, **kwargs):
727
self._approvals_pending = 0
1050
728
self.bus = bus
1051
729
Client.__init__(self, *args, **kwargs)
1052
self._approvals_pending = 0
1053
1054
self._approvals_pending = 0
1055
730
# Only now, when this client is initialized, can it show up on
1056
731
# the D-Bus
1057
732
client_object_name = unicode(self.name).translate(
1062
737
DBusObjectWithProperties.__init__(self, self.bus,
1063
738
self.dbus_object_path)
1064
739
1065
def notifychangeproperty(transform_func,
1066
dbus_name, type_func=lambda x: x,
1067
variant_level=1):
1068
""" Modify a variable so that it's a property which announces
1069
its changes to DBus.
1070
1071
transform_fun: Function that takes a value and a variant_level
1072
and transforms it to a D-Bus type.
1073
dbus_name: D-Bus name of the variable
1074
type_func: Function that transform the value before sending it
1075
to the D-Bus. Default: no transform
1076
variant_level: D-Bus variant level. Default: 1
1077
"""
1078
attrname = "_{0}".format(dbus_name)
1079
def setter(self, value):
1080
if hasattr(self, "dbus_object_path"):
1081
if (not hasattr(self, attrname) or
1082
type_func(getattr(self, attrname, None))
1083
!= type_func(value)):
1084
dbus_value = transform_func(type_func(value),
1085
variant_level
1086
=variant_level)
1087
self.PropertyChanged(dbus.String(dbus_name),
1088
dbus_value)
1089
setattr(self, attrname, value)
1090
1091
return property(lambda self: getattr(self, attrname), setter)
1092
1093
1094
expires = notifychangeproperty(datetime_to_dbus, "Expires")
1095
approvals_pending = notifychangeproperty(dbus.Boolean,
1096
"ApprovalPending",
1097
type_func = bool)
1098
enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1099
last_enabled = notifychangeproperty(datetime_to_dbus,
1100
"LastEnabled")
1101
checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
1102
type_func = lambda checker:
1103
checker is not None)
1104
last_checked_ok = notifychangeproperty(datetime_to_dbus,
1105
"LastCheckedOK")
1106
last_approval_request = notifychangeproperty(
1107
datetime_to_dbus, "LastApprovalRequest")
1108
approved_by_default = notifychangeproperty(dbus.Boolean,
1109
"ApprovedByDefault")
1110
approval_delay = notifychangeproperty(dbus.UInt64,
1111
"ApprovalDelay",
1112
type_func =
1113
timedelta_to_milliseconds)
1114
approval_duration = notifychangeproperty(
1115
dbus.UInt64, "ApprovalDuration",
1116
type_func = timedelta_to_milliseconds)
1117
host = notifychangeproperty(dbus.String, "Host")
1118
timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1119
type_func =
1120
timedelta_to_milliseconds)
1121
extended_timeout = notifychangeproperty(
1122
dbus.UInt64, "ExtendedTimeout",
1123
type_func = timedelta_to_milliseconds)
1124
interval = notifychangeproperty(dbus.UInt64,
1125
"Interval",
1126
type_func =
1127
timedelta_to_milliseconds)
1128
checker_command = notifychangeproperty(dbus.String, "Checker")
1129
1130
del notifychangeproperty
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
1131
783
1132
784
def __del__(self, *args, **kwargs):
1133
785
try:
1142
794
*args, **kwargs):
1143
795
self.checker_callback_tag = None
1144
796
self.checker = None
797
# Emit D-Bus signal
798
self.PropertyChanged(dbus.String("CheckerRunning"),
799
dbus.Boolean(False, variant_level=1))
1145
800
if os.WIFEXITED(condition):
1146
801
exitstatus = os.WEXITSTATUS(condition)
1147
802
# Emit D-Bus signal
1157
812
return Client.checker_callback(self, pid, condition, command,
1158
813
*args, **kwargs)
1159
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
1160
833
def start_checker(self, *args, **kwargs):
1161
834
old_checker = self.checker
1162
835
if self.checker is not None:
1169
842
and old_checker_pid != self.checker.pid):
1170
843
# Emit D-Bus signal
1171
844
self.CheckerStarted(self.current_checker_command)
845
self.PropertyChanged(
846
dbus.String("CheckerRunning"),
847
dbus.Boolean(True, variant_level=1))
1172
848
return r
1173
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
1174
859
def _reset_approved(self):
1175
self.approved = None
860
self._approved = None
1176
861
return False
1177
862
1178
863
def approve(self, value=True):
1179
864
self.send_changedstate()
1180
self.approved = value
1181
gobject.timeout_add(timedelta_to_milliseconds
865
self._approved = value
866
gobject.timeout_add(self._timedelta_to_milliseconds
1182
867
(self.approval_duration),
1183
868
self._reset_approved)
1184
869
1185
870
1186
871
## D-Bus methods, signals & properties
1187
_interface = "se.recompile.Mandos.Client"
872
_interface = "se.bsnet.fukt.Mandos.Client"
1188
873
1189
874
## Signals
1190
875
1227
912
"D-Bus signal"
1228
913
return self.need_approval()
1229
914
1230
# NeRwequest - signal
1231
@dbus.service.signal(_interface, signature="s")
1232
def NewRequest(self, ip):
1233
"""D-Bus signal
1234
Is sent after a client request a password.
1235
"""
1236
pass
1237
1238
915
## Methods
1239
916
1240
917
# Approve - method
1245
922
# CheckedOK - method
1246
923
@dbus.service.method(_interface)
1247
924
def CheckedOK(self):
1248
self.checked_ok()
925
return self.checked_ok()
1249
926
1250
927
# Enable - method
1251
928
@dbus.service.method(_interface)
1284
961
if value is None: # get
1285
962
return dbus.Boolean(self.approved_by_default)
1286
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))
1287
967
1288
968
# ApprovalDelay - property
1289
969
@dbus_service_property(_interface, signature="t",
1292
972
if value is None: # get
1293
973
return dbus.UInt64(self.approval_delay_milliseconds())
1294
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))
1295
978
1296
979
# ApprovalDuration - property
1297
980
@dbus_service_property(_interface, signature="t",
1298
981
access="readwrite")
1299
982
def ApprovalDuration_dbus_property(self, value=None):
1300
983
if value is None: # get
1301
return dbus.UInt64(timedelta_to_milliseconds(
984
return dbus.UInt64(self._timedelta_to_milliseconds(
1302
985
self.approval_duration))
1303
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))
1304
990
1305
991
# Name - property
1306
992
@dbus_service_property(_interface, signature="s", access="read")
1318
1004
def Host_dbus_property(self, value=None):
1319
1005
if value is None: # get
1320
1006
return dbus.String(self.host)
1321
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))
1322
1011
1323
1012
# Created - property
1324
1013
@dbus_service_property(_interface, signature="s", access="read")
1325
1014
def Created_dbus_property(self):
1326
return datetime_to_dbus(self.created)
1015
return dbus.String(self._datetime_to_dbus(self.created))
1327
1016
1328
1017
# LastEnabled - property
1329
1018
@dbus_service_property(_interface, signature="s", access="read")
1330
1019
def LastEnabled_dbus_property(self):
1331
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))
1332
1023
1333
1024
# Enabled - property
1334
1025
@dbus_service_property(_interface, signature="b",
1348
1039
if value is not None:
1349
1040
self.checked_ok()
1350
1041
return
1351
return datetime_to_dbus(self.last_checked_ok)
1352
1353
# Expires - property
1354
@dbus_service_property(_interface, signature="s", access="read")
1355
def Expires_dbus_property(self):
1356
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))
1357
1046
1358
1047
# LastApprovalRequest - property
1359
1048
@dbus_service_property(_interface, signature="s", access="read")
1360
1049
def LastApprovalRequest_dbus_property(self):
1361
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))
1362
1055
1363
1056
# Timeout - property
1364
1057
@dbus_service_property(_interface, signature="t",
1367
1060
if value is None: # get
1368
1061
return dbus.UInt64(self.timeout_milliseconds())
1369
1062
self.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
1370
1068
# Reschedule timeout
1371
if self.enabled:
1372
now = datetime.datetime.utcnow()
1373
time_to_die = timedelta_to_milliseconds(
1374
(self.last_checked_ok + self.timeout) - now)
1375
if time_to_die <= 0:
1376
# The timeout has passed
1377
self.disable()
1378
else:
1379
self.expires = (now +
1380
datetime.timedelta(milliseconds =
1381
time_to_die))
1382
if (getattr(self, "disable_initiator_tag", None)
1383
is None):
1384
return
1385
gobject.source_remove(self.disable_initiator_tag)
1386
self.disable_initiator_tag = (gobject.timeout_add
1387
(time_to_die,
1388
self.disable))
1389
1390
# ExtendedTimeout - property
1391
@dbus_service_property(_interface, signature="t",
1392
access="readwrite")
1393
def ExtendedTimeout_dbus_property(self, value=None):
1394
if value is None: # get
1395
return dbus.UInt64(self.extended_timeout_milliseconds())
1396
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
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))
1397
1083
1398
1084
# Interval - property
1399
1085
@dbus_service_property(_interface, signature="t",
1402
1088
if value is None: # get
1403
1089
return dbus.UInt64(self.interval_milliseconds())
1404
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))
1405
1094
if getattr(self, "checker_initiator_tag", None) is None:
1406
1095
return
1407
if self.enabled:
1408
# Reschedule checker run
1409
gobject.source_remove(self.checker_initiator_tag)
1410
self.checker_initiator_tag = (gobject.timeout_add
1411
(value, self.start_checker))
1412
self.start_checker() # Start one now, too
1413
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
1414
1102
# Checker - property
1415
1103
@dbus_service_property(_interface, signature="s",
1416
1104
access="readwrite")
1417
1105
def Checker_dbus_property(self, value=None):
1418
1106
if value is None: # get
1419
1107
return dbus.String(self.checker_command)
1420
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))
1421
1113
1422
1114
# CheckerRunning - property
1423
1115
@dbus_service_property(_interface, signature="b",
1450
1142
self._pipe.send(('init', fpr, address))
1451
1143
if not self._pipe.recv():
1452
1144
raise KeyError()
1453
1145
1454
1146
def __getattribute__(self, name):
1455
if name == '_pipe':
1147
if(name == '_pipe'):
1456
1148
return super(ProxyClient, self).__getattribute__(name)
1457
1149
self._pipe.send(('getattr', name))
1458
1150
data = self._pipe.recv()
1463
1155
self._pipe.send(('funcall', name, args, kwargs))
1464
1156
return self._pipe.recv()[1]
1465
1157
return func
1466
1158
1467
1159
def __setattr__(self, name, value):
1468
if name == '_pipe':
1160
if(name == '_pipe'):
1469
1161
return super(ProxyClient, self).__setattr__(name, value)
1470
1162
self._pipe.send(('setattr', name, value))
1471
1163
1472
1164
1473
class ClientDBusTransitional(ClientDBus):
1474
__metaclass__ = AlternateDBusNamesMetaclass
1475
1476
1477
1165
class ClientHandler(socketserver.BaseRequestHandler, object):
1478
1166
"""A class to handle client connections.
1479
1167
1486
1174
unicode(self.client_address))
1487
1175
logger.debug("Pipe FD: %d",
1488
1176
self.server.child_pipe.fileno())
1489
1177
1490
1178
session = (gnutls.connection
1491
1179
.ClientSession(self.request,
1492
1180
gnutls.connection
1493
1181
.X509Credentials()))
1494
1182
1495
1183
# Note: gnutls.connection.X509Credentials is really a
1496
1184
# generic GnuTLS certificate credentials object so long as
1497
1185
# no X.509 keys are added to it. Therefore, we can use it
1498
1186
# here despite using OpenPGP certificates.
1499
1187
1500
1188
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1501
1189
# "+AES-256-CBC", "+SHA1",
1502
1190
# "+COMP-NULL", "+CTYPE-OPENPGP",
1508
1196
(gnutls.library.functions
1509
1197
.gnutls_priority_set_direct(session._c_object,
1510
1198
priority, None))
1511
1199
1512
1200
# Start communication using the Mandos protocol
1513
1201
# Get protocol number
1514
1202
line = self.request.makefile().readline()
1516
1204
try:
1517
1205
if int(line.strip().split()[0]) > 1:
1518
1206
raise RuntimeError
1519
except (ValueError, IndexError, RuntimeError) as error:
1207
except (ValueError, IndexError, RuntimeError), error:
1520
1208
logger.error("Unknown protocol version: %s", error)
1521
1209
return
1522
1210
1523
1211
# Start GnuTLS connection
1524
1212
try:
1525
1213
session.handshake()
1526
except gnutls.errors.GNUTLSError as error:
1214
except gnutls.errors.GNUTLSError, error:
1527
1215
logger.warning("Handshake failed: %s", error)
1528
1216
# Do not run session.bye() here: the session is not
1529
1217
# established. Just abandon the request.
1530
1218
return
1531
1219
logger.debug("Handshake succeeded")
1532
1220
1533
1221
approval_required = False
1534
1222
try:
1535
1223
try:
1536
1224
fpr = self.fingerprint(self.peer_certificate
1537
1225
(session))
1538
except (TypeError,
1539
gnutls.errors.GNUTLSError) as error:
1226
except (TypeError, gnutls.errors.GNUTLSError), error:
1540
1227
logger.warning("Bad certificate: %s", error)
1541
1228
return
1542
1229
logger.debug("Fingerprint: %s", fpr)
1543
1230
1544
1231
try:
1545
1232
client = ProxyClient(child_pipe, fpr,
1546
1233
self.client_address)
1547
1234
except KeyError:
1548
1235
return
1549
1236
1550
if self.server.use_dbus:
1551
# Emit D-Bus signal
1552
client.NewRequest(str(self.client_address))
1553
1554
1237
if client.approval_delay:
1555
1238
delay = client.approval_delay
1556
1239
client.approvals_pending += 1
1558
1241
1559
1242
while True:
1560
1243
if not client.enabled:
1561
logger.info("Client %s is disabled",
1244
logger.warning("Client %s is disabled",
1562
1245
client.name)
1563
1246
if self.server.use_dbus:
1564
1247
# Emit D-Bus signal
1565
client.Rejected("Disabled")
1248
client.Rejected("Disabled")
1566
1249
return
1567
1250
1568
if client.approved or not client.approval_delay:
1251
if client._approved or not client.approval_delay:
1569
1252
#We are approved or approval is disabled
1570
1253
break
1571
elif client.approved is None:
1254
elif client._approved is None:
1572
1255
logger.info("Client %s needs approval",
1573
1256
client.name)
1574
1257
if self.server.use_dbus:
1585
1268
return
1586
1269
1587
1270
#wait until timeout or approved
1271
#x = float(client._timedelta_to_milliseconds(delay))
1588
1272
time = datetime.datetime.now()
1589
1273
client.changedstate.acquire()
1590
(client.changedstate.wait
1591
(float(client.timedelta_to_milliseconds(delay)
1592
/ 1000)))
1274
client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
1593
1275
client.changedstate.release()
1594
1276
time2 = datetime.datetime.now()
1595
1277
if (time2 - time) >= delay:
1610
1292
while sent_size < len(client.secret):
1611
1293
try:
1612
1294
sent = session.send(client.secret[sent_size:])
1613
except gnutls.errors.GNUTLSError as error:
1295
except (gnutls.errors.GNUTLSError), error:
1614
1296
logger.warning("gnutls send failed")
1615
1297
return
1616
1298
logger.debug("Sent: %d, remaining: %d",
1617
1299
sent, len(client.secret)
1618
1300
- (sent_size + sent))
1619
1301
sent_size += sent
1620
1302
1621
1303
logger.info("Sending secret to %s", client.name)
1622
# bump the timeout using extended_timeout
1623
client.checked_ok(client.extended_timeout)
1304
# bump the timeout as if seen
1305
client.checked_ok()
1624
1306
if self.server.use_dbus:
1625
1307
# Emit D-Bus signal
1626
1308
client.GotSecret()
1630
1312
client.approvals_pending -= 1
1631
1313
try:
1632
1314
session.bye()
1633
except gnutls.errors.GNUTLSError as error:
1315
except (gnutls.errors.GNUTLSError), error:
1634
1316
logger.warning("GnuTLS bye failed")
1635
1317
1636
1318
@staticmethod
1693
1375
# Convert the buffer to a Python bytestring
1694
1376
fpr = ctypes.string_at(buf, buf_len.value)
1695
1377
# Convert the bytestring to hexadecimal notation
1696
hex_fpr = binascii.hexlify(fpr).upper()
1378
hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
1697
1379
return hex_fpr
1698
1380
1699
1381
1702
1384
def sub_process_main(self, request, address):
1703
1385
try:
1704
1386
self.finish_request(request, address)
1705
except Exception:
1387
except:
1706
1388
self.handle_error(request, address)
1707
1389
self.close_request(request)
1708
1390
1709
1391
def process_request(self, request, address):
1710
1392
"""Start a new process to process the request."""
1711
proc = multiprocessing.Process(target = self.sub_process_main,
1712
args = (request,
1713
address))
1714
proc.start()
1715
return proc
1716
1393
multiprocessing.Process(target = self.sub_process_main,
1394
args = (request, address)).start()
1717
1395
1718
1396
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1719
1397
""" adds a pipe to the MixIn """
1723
1401
This function creates a new pipe in self.pipe
1724
1402
"""
1725
1403
parent_pipe, self.child_pipe = multiprocessing.Pipe()
1726
1727
proc = MultiprocessingMixIn.process_request(self, request,
1728
client_address)
1404
1405
super(MultiprocessingMixInWithPipe,
1406
self).process_request(request, client_address)
1729
1407
self.child_pipe.close()
1730
self.add_pipe(parent_pipe, proc)
1731
1732
def add_pipe(self, parent_pipe, proc):
1408
self.add_pipe(parent_pipe)
1409
1410
def add_pipe(self, parent_pipe):
1733
1411
"""Dummy function; override as necessary"""
1734
1412
raise NotImplementedError
1735
1413
1736
1737
1414
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1738
1415
socketserver.TCPServer, object):
1739
1416
"""IPv6-capable TCP server. Accepts 'None' as address and/or port
1765
1442
SO_BINDTODEVICE,
1766
1443
str(self.interface
1767
1444
+ '\0'))
1768
except socket.error as error:
1445
except socket.error, error:
1769
1446
if error[0] == errno.EPERM:
1770
1447
logger.error("No permission to"
1771
1448
" bind to interface %s",
1813
1490
self.enabled = False
1814
1491
self.clients = clients
1815
1492
if self.clients is None:
1816
self.clients = {}
1493
self.clients = set()
1817
1494
self.use_dbus = use_dbus
1818
1495
self.gnutls_priority = gnutls_priority
1819
1496
IPv6_TCPServer.__init__(self, server_address,
1823
1500
def server_activate(self):
1824
1501
if self.enabled:
1825
1502
return socketserver.TCPServer.server_activate(self)
1826
1827
1503
def enable(self):
1828
1504
self.enabled = True
1829
1830
def add_pipe(self, parent_pipe, proc):
1505
def add_pipe(self, parent_pipe):
1831
1506
# Call "handle_ipc" for both data and EOF events
1832
1507
gobject.io_add_watch(parent_pipe.fileno(),
1833
1508
gobject.IO_IN | gobject.IO_HUP,
1834
1509
functools.partial(self.handle_ipc,
1835
parent_pipe =
1836
parent_pipe,
1837
proc = proc))
1838
1510
parent_pipe = parent_pipe))
1511
1839
1512
def handle_ipc(self, source, condition, parent_pipe=None,
1840
proc = None, client_object=None):
1513
client_object=None):
1841
1514
condition_names = {
1842
1515
gobject.IO_IN: "IN", # There is data to read.
1843
1516
gobject.IO_OUT: "OUT", # Data can be written (without
1852
1525
for cond, name in
1853
1526
condition_names.iteritems()
1854
1527
if cond & condition)
1855
# error, or the other end of multiprocessing.Pipe has closed
1528
# error or the other end of multiprocessing.Pipe has closed
1856
1529
if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
1857
# Wait for other process to exit
1858
proc.join()
1859
1530
return False
1860
1531
1861
1532
# Read a request from the child
1866
1537
fpr = request[1]
1867
1538
address = request[2]
1868
1539
1869
for c in self.clients.itervalues():
1540
for c in self.clients:
1870
1541
if c.fingerprint == fpr:
1871
1542
client = c
1872
1543
break
1873
1544
else:
1874
logger.info("Client not found for fingerprint: %s, ad"
1875
"dress: %s", fpr, address)
1545
logger.warning("Client not found for fingerprint: %s, ad"
1546
"dress: %s", fpr, address)
1876
1547
if self.use_dbus:
1877
1548
# Emit D-Bus signal
1878
mandos_dbus_service.ClientNotFound(fpr,
1879
address[0])
1549
mandos_dbus_service.ClientNotFound(fpr, address[0])
1880
1550
parent_pipe.send(False)
1881
1551
return False
1882
1552
1883
1553
gobject.io_add_watch(parent_pipe.fileno(),
1884
1554
gobject.IO_IN | gobject.IO_HUP,
1885
1555
functools.partial(self.handle_ipc,
1886
parent_pipe =
1887
parent_pipe,
1888
proc = proc,
1889
client_object =
1890
client))
1556
parent_pipe = parent_pipe,
1557
client_object = client))
1891
1558
parent_pipe.send(True)
1892
# remove the old hook in favor of the new above hook on
1893
# same fileno
1559
# remove the old hook in favor of the new above hook on same fileno
1894
1560
return False
1895
1561
if command == 'funcall':
1896
1562
funcname = request[1]
1897
1563
args = request[2]
1898
1564
kwargs = request[3]
1899
1565
1900
parent_pipe.send(('data', getattr(client_object,
1901
funcname)(*args,
1902
**kwargs)))
1903
1566
parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
1567
1904
1568
if command == 'getattr':
1905
1569
attrname = request[1]
1906
1570
if callable(client_object.__getattribute__(attrname)):
1907
1571
parent_pipe.send(('function',))
1908
1572
else:
1909
parent_pipe.send(('data', client_object
1910
.__getattribute__(attrname)))
1573
parent_pipe.send(('data', client_object.__getattribute__(attrname)))
1911
1574
1912
1575
if command == 'setattr':
1913
1576
attrname = request[1]
1914
1577
value = request[2]
1915
1578
setattr(client_object, attrname, value)
1916
1579
1917
1580
return True
1918
1581
1919
1582
1950
1613
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1951
1614
else:
1952
1615
raise ValueError("Unknown suffix %r" % suffix)
1953
except (ValueError, IndexError) as e:
1616
except (ValueError, IndexError), e:
1954
1617
raise ValueError(*(e.args))
1955
1618
timevalue += delta
1956
1619
return timevalue
1957
1620
1958
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
1959
1646
def daemon(nochdir = False, noclose = False):
1960
1647
"""See daemon(3). Standard BSD Unix function.
1961
1648
1986
1673
##################################################################
1987
1674
# Parsing of options, both command line and config file
1988
1675
1989
parser = argparse.ArgumentParser()
1990
parser.add_argument("-v", "--version", action="version",
1991
version = "%%(prog)s %s" % version,
1992
help="show version number and exit")
1993
parser.add_argument("-i", "--interface", metavar="IF",
1994
help="Bind to interface IF")
1995
parser.add_argument("-a", "--address",
1996
help="Address to listen for requests on")
1997
parser.add_argument("-p", "--port", type=int,
1998
help="Port number to receive requests on")
1999
parser.add_argument("--check", action="store_true",
2000
help="Run self-test")
2001
parser.add_argument("--debug", action="store_true",
2002
help="Debug mode; run in foreground and log"
2003
" to terminal")
2004
parser.add_argument("--debuglevel", metavar="LEVEL",
2005
help="Debug level for stdout output")
2006
parser.add_argument("--priority", help="GnuTLS"
2007
" priority string (see GnuTLS documentation)")
2008
parser.add_argument("--servicename",
2009
metavar="NAME", help="Zeroconf service name")
2010
parser.add_argument("--configdir",
2011
default="/etc/mandos", metavar="DIR",
2012
help="Directory to search for configuration"
2013
" files")
2014
parser.add_argument("--no-dbus", action="store_false",
2015
dest="use_dbus", help="Do not provide D-Bus"
2016
" system bus interface")
2017
parser.add_argument("--no-ipv6", action="store_false",
2018
dest="use_ipv6", help="Do not use IPv6")
2019
parser.add_argument("--no-restore", action="store_false",
2020
dest="restore", help="Do not restore stored"
2021
" state")
2022
parser.add_argument("--statedir", metavar="DIR",
2023
help="Directory to save/restore state in")
2024
2025
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]
2026
1704
2027
1705
if options.check:
2028
1706
import doctest
2040
1718
"use_dbus": "True",
2041
1719
"use_ipv6": "True",
2042
1720
"debuglevel": "",
2043
"restore": "True",
2044
"statedir": "/var/lib/mandos"
2045
1721
}
2046
1722
2047
1723
# Parse config file for server-global settings
2064
1740
# options, if set.
2065
1741
for option in ("interface", "address", "port", "debug",
2066
1742
"priority", "servicename", "configdir",
2067
"use_dbus", "use_ipv6", "debuglevel", "restore",
2068
"statedir"):
1743
"use_dbus", "use_ipv6", "debuglevel"):
2069
1744
value = getattr(options, option)
2070
1745
if value is not None:
2071
1746
server_settings[option] = value
2083
1758
debuglevel = server_settings["debuglevel"]
2084
1759
use_dbus = server_settings["use_dbus"]
2085
1760
use_ipv6 = server_settings["use_ipv6"]
2086
stored_state_path = os.path.join(server_settings["statedir"],
2087
stored_state_file)
2088
2089
if debug:
2090
initlogger(debug, logging.DEBUG)
2091
else:
2092
if not debuglevel:
2093
initlogger(debug)
2094
else:
2095
level = getattr(logging, debuglevel.upper())
2096
initlogger(debug, level)
2097
1761
2098
1762
if server_settings["servicename"] != "Mandos":
2099
1763
syslogger.setFormatter(logging.Formatter
2100
1764
('Mandos (%s) [%%(process)d]:'
2102
1766
% server_settings["servicename"]))
2103
1767
2104
1768
# Parse config file with clients
2105
client_config = configparser.SafeConfigParser(Client
2106
.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)
2107
1777
client_config.read(os.path.join(server_settings["configdir"],
2108
1778
"clients.conf"))
2109
1779
2143
1813
try:
2144
1814
os.setgid(gid)
2145
1815
os.setuid(uid)
2146
except OSError as error:
1816
except OSError, error:
2147
1817
if error[0] != errno.EPERM:
2148
1818
raise error
2149
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
2150
1828
if debug:
2151
1829
# Enable all possible GnuTLS debugging
2152
1830
2166
1844
os.dup2(null, sys.stdin.fileno())
2167
1845
if null > 2:
2168
1846
os.close(null)
1847
else:
1848
# No console logging
1849
logger.removeHandler(console)
2169
1850
2170
1851
# Need to fork before connecting to D-Bus
2171
1852
if not debug:
2172
1853
# Close all input and output, do double fork, etc.
2173
1854
daemon()
2174
1855
2175
gobject.threads_init()
2176
2177
1856
global main_loop
2178
1857
# From the Avahi example code
2179
1858
DBusGMainLoop(set_as_default=True )
2182
1861
# End of Avahi example code
2183
1862
if use_dbus:
2184
1863
try:
2185
bus_name = dbus.service.BusName("se.recompile.Mandos",
1864
bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
2186
1865
bus, do_not_queue=True)
2187
old_bus_name = (dbus.service.BusName
2188
("se.bsnet.fukt.Mandos", bus,
2189
do_not_queue=True))
2190
except dbus.exceptions.NameExistsException as e:
1866
except dbus.exceptions.NameExistsException, e:
2191
1867
logger.error(unicode(e) + ", disabling D-Bus")
2192
1868
use_dbus = False
2193
1869
server_settings["use_dbus"] = False
2194
1870
tcp_server.use_dbus = False
2195
1871
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2196
service = AvahiServiceToSyslog(name =
2197
server_settings["servicename"],
2198
servicetype = "_mandos._tcp",
2199
protocol = protocol, bus = bus)
1872
service = AvahiService(name = server_settings["servicename"],
1873
servicetype = "_mandos._tcp",
1874
protocol = protocol, bus = bus)
2200
1875
if server_settings["interface"]:
2201
1876
service.interface = (if_nametoindex
2202
1877
(str(server_settings["interface"])))
2206
1881
2207
1882
client_class = Client
2208
1883
if use_dbus:
2209
client_class = functools.partial(ClientDBusTransitional,
2210
bus = bus)
2211
2212
client_settings = Client.config_parser(client_config)
2213
old_client_settings = {}
2214
clients_data = {}
2215
2216
# Get client data and settings from last running state.
2217
if server_settings["restore"]:
2218
try:
2219
with open(stored_state_path, "rb") as stored_state:
2220
clients_data, old_client_settings = (pickle.load
2221
(stored_state))
2222
os.remove(stored_state_path)
2223
except IOError as e:
2224
logger.warning("Could not load persistent state: {0}"
2225
.format(e))
2226
if e.errno != errno.ENOENT:
2227
raise
2228
except EOFError as e:
2229
logger.warning("Could not load persistent state: "
2230
"EOFError: {0}".format(e))
2231
2232
with PGPEngine() as pgp:
2233
for client_name, client in clients_data.iteritems():
2234
# Decide which value to use after restoring saved state.
2235
# We have three different values: Old config file,
2236
# new config file, and saved state.
2237
# New config value takes precedence if it differs from old
2238
# config value, otherwise use saved state.
2239
for name, value in client_settings[client_name].items():
2240
try:
2241
# For each value in new config, check if it
2242
# differs from the old config value (Except for
2243
# the "secret" attribute)
2244
if (name != "secret" and
2245
value != old_client_settings[client_name]
2246
[name]):
2247
client[name] = value
2248
except KeyError:
2249
pass
2250
2251
# Clients who has passed its expire date can still be
2252
# enabled if its last checker was successful. Clients
2253
# whose checker failed before we stored its state is
2254
# assumed to have failed all checkers during downtime.
2255
if client["enabled"]:
2256
if datetime.datetime.utcnow() >= client["expires"]:
2257
if not client["last_checked_ok"]:
2258
logger.warning(
2259
"disabling client {0} - Client never "
2260
"performed a successfull checker"
2261
.format(client["name"]))
2262
client["enabled"] = False
2263
elif client["last_checker_status"] != 0:
2264
logger.warning(
2265
"disabling client {0} - Client "
2266
"last checker failed with error code {1}"
2267
.format(client["name"],
2268
client["last_checker_status"]))
2269
client["enabled"] = False
2270
else:
2271
client["expires"] = (datetime.datetime
2272
.utcnow()
2273
+ client["timeout"])
2274
logger.debug("Last checker succeeded,"
2275
" keeping {0} enabled"
2276
.format(client["name"]))
1884
client_class = functools.partial(ClientDBus, bus = bus)
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):
2277
1892
try:
2278
client["secret"] = (
2279
pgp.decrypt(client["encrypted_secret"],
2280
client_settings[client_name]
2281
["secret"]))
2282
except PGPError:
2283
# If decryption fails, we use secret from new settings
2284
logger.debug("Failed to decrypt {0} old secret"
2285
.format(client_name))
2286
client["secret"] = (
2287
client_settings[client_name]["secret"])
2288
2289
2290
# Add/remove clients based on new changes made to config
2291
for client_name in (set(old_client_settings)
2292
- set(client_settings)):
2293
del clients_data[client_name]
2294
for client_name in (set(client_settings)
2295
- set(old_client_settings)):
2296
clients_data[client_name] = client_settings[client_name]
2297
2298
# Create clients all clients
2299
for client_name, client in clients_data.iteritems():
2300
tcp_server.clients[client_name] = client_class(
2301
name = client_name, settings = client)
2302
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()))
2303
1902
if not tcp_server.clients:
2304
1903
logger.warning("No clients defined")
2305
1904
2316
1915
# "pidfile" was never created
2317
1916
pass
2318
1917
del pidfilename
1918
2319
1919
signal.signal(signal.SIGINT, signal.SIG_IGN)
2320
1920
2321
1921
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2322
1922
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2323
1923
2326
1926
"""A D-Bus proxy object"""
2327
1927
def __init__(self):
2328
1928
dbus.service.Object.__init__(self, bus, "/")
2329
_interface = "se.recompile.Mandos"
1929
_interface = "se.bsnet.fukt.Mandos"
2330
1930
2331
1931
@dbus.service.signal(_interface, signature="o")
2332
1932
def ClientAdded(self, objpath):
2347
1947
def GetAllClients(self):
2348
1948
"D-Bus method"
2349
1949
return dbus.Array(c.dbus_object_path
2350
for c in
2351
tcp_server.clients.itervalues())
1950
for c in tcp_server.clients)
2352
1951
2353
1952
@dbus.service.method(_interface,
2354
1953
out_signature="a{oa{sv}}")
2356
1955
"D-Bus method"
2357
1956
return dbus.Dictionary(
2358
1957
((c.dbus_object_path, c.GetAll(""))
2359
for c in tcp_server.clients.itervalues()),
1958
for c in tcp_server.clients),
2360
1959
signature="oa{sv}")
2361
1960
2362
1961
@dbus.service.method(_interface, in_signature="o")
2363
1962
def RemoveClient(self, object_path):
2364
1963
"D-Bus method"
2365
for c in tcp_server.clients.itervalues():
1964
for c in tcp_server.clients:
2366
1965
if c.dbus_object_path == object_path:
2367
del tcp_server.clients[c.name]
1966
tcp_server.clients.remove(c)
2368
1967
c.remove_from_connection()
2369
1968
# Don't signal anything except ClientRemoved
2370
1969
c.disable(quiet=True)
2375
1974
2376
1975
del _interface
2377
1976
2378
class MandosDBusServiceTransitional(MandosDBusService):
2379
__metaclass__ = AlternateDBusNamesMetaclass
2380
mandos_dbus_service = MandosDBusServiceTransitional()
1977
mandos_dbus_service = MandosDBusService()
2381
1978
2382
1979
def cleanup():
2383
1980
"Cleanup function; run on exit"
2384
1981
service.cleanup()
2385
1982
2386
multiprocessing.active_children()
2387
if not (tcp_server.clients or client_settings):
2388
return
2389
2390
# Store client before exiting. Secrets are encrypted with key
2391
# based on what config file has. If config file is
2392
# removed/edited, old secret will thus be unrecovable.
2393
clients = {}
2394
with PGPEngine() as pgp:
2395
for client in tcp_server.clients.itervalues():
2396
key = client_settings[client.name]["secret"]
2397
client.encrypted_secret = pgp.encrypt(client.secret,
2398
key)
2399
client_dict = {}
2400
2401
# A list of attributes that can not be pickled
2402
# + secret.
2403
exclude = set(("bus", "changedstate", "secret",
2404
"checker"))
2405
for name, typ in (inspect.getmembers
2406
(dbus.service.Object)):
2407
exclude.add(name)
2408
2409
client_dict["encrypted_secret"] = (client
2410
.encrypted_secret)
2411
for attr in client.client_structure:
2412
if attr not in exclude:
2413
client_dict[attr] = getattr(client, attr)
2414
2415
clients[client.name] = client_dict
2416
del client_settings[client.name]["secret"]
2417
2418
try:
2419
tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
2420
prefix="clients-",
2421
dir=os.path.dirname
2422
(stored_state_path))
2423
with os.fdopen(tempfd, "wb") as stored_state:
2424
pickle.dump((clients, client_settings), stored_state)
2425
os.rename(tempname, stored_state_path)
2426
except (IOError, OSError) as e:
2427
logger.warning("Could not save persistent state: {0}"
2428
.format(e))
2429
if not debug:
2430
try:
2431
os.remove(tempname)
2432
except NameError:
2433
pass
2434
if e.errno not in set((errno.ENOENT, errno.EACCES,
2435
errno.EEXIST)):
2436
raise e
2437
2438
# Delete all clients, and settings from config
2439
1983
while tcp_server.clients:
2440
name, client = tcp_server.clients.popitem()
1984
client = tcp_server.clients.pop()
2441
1985
if use_dbus:
2442
1986
client.remove_from_connection()
1987
client.disable_hook = None
2443
1988
# Don't signal anything except ClientRemoved
2444
1989
client.disable(quiet=True)
2445
1990
if use_dbus:
2446
1991
# Emit D-Bus signal
2447
mandos_dbus_service.ClientRemoved(client
2448
.dbus_object_path,
1992
mandos_dbus_service.ClientRemoved(client.dbus_object_path,
2449
1993
client.name)
2450
client_settings.clear()
2451
1994
2452
1995
atexit.register(cleanup)
2453
1996
2454
for client in tcp_server.clients.itervalues():
1997
for client in tcp_server.clients:
2455
1998
if use_dbus:
2456
1999
# Emit D-Bus signal
2457
2000
mandos_dbus_service.ClientAdded(client.dbus_object_path)
2458
# Need to initiate checking of clients
2459
if client.enabled:
2460
client.init_checker()
2001
client.enable()
2461
2002
2462
2003
tcp_server.enable()
2463
2004
tcp_server.server_activate()
2478
2019
# From the Avahi example code
2479
2020
try:
2480
2021
service.activate()
2481
except dbus.exceptions.DBusException as error:
2022
except dbus.exceptions.DBusException, error:
2482
2023
logger.critical("DBusException: %s", error)
2483
2024
cleanup()
2484
2025
sys.exit(1)
2491
2032
2492
2033
logger.debug("Starting main loop")
2493
2034
main_loop.run()
2494
except AvahiError as error:
2035
except AvahiError, error:
2495
2036
logger.critical("AvahiError: %s", error)
2496
2037
cleanup()
2497
2038
sys.exit(1)
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0