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.2"
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, -2 means no checker completed yet.
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 secret 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"] = -2
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
416
def checked_ok(self):
630
"""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
"""
631
422
self.last_checked_ok = datetime.datetime.utcnow()
632
self.last_checker_status = 0
633
self.bump_timeout()
634
635
def bump_timeout(self, timeout=None):
636
"""Bump up the timeout for this client."""
637
if timeout is None:
638
timeout = self.timeout
639
if self.disable_initiator_tag is not None:
640
gobject.source_remove(self.disable_initiator_tag)
641
if getattr(self, "enabled", False):
642
self.disable_initiator_tag = (gobject.timeout_add
643
(timedelta_to_milliseconds
644
(timeout), self.disable))
645
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))
646
427
647
428
def need_approval(self):
648
429
self.last_approval_request = datetime.datetime.utcnow()
664
445
# If a checker exists, make sure it is not a zombie
665
446
try:
666
447
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
667
except (AttributeError, OSError) as error:
448
except (AttributeError, OSError), error:
668
449
if (isinstance(error, OSError)
669
450
and error.errno != errno.ECHILD):
670
451
raise error
688
469
'replace')))
689
470
for attr in
690
471
self.runtime_expansions)
691
472
692
473
try:
693
474
command = self.checker_command % escaped_attrs
694
except TypeError as error:
475
except TypeError, error:
695
476
logger.error('Could not format string "%s":'
696
477
' %s', self.checker_command, error)
697
478
return True # Try again later
716
497
if pid:
717
498
gobject.source_remove(self.checker_callback_tag)
718
499
self.checker_callback(pid, status, command)
719
except OSError as error:
500
except OSError, error:
720
501
logger.error("Failed to start subprocess: %s",
721
502
error)
722
503
# Re-run this periodically if run by gobject.timeout_add
735
516
#time.sleep(0.5)
736
517
#if self.checker.poll() is None:
737
518
# os.kill(self.checker.pid, signal.SIGKILL)
738
except OSError as error:
519
except OSError, error:
739
520
if error.errno != errno.ESRCH: # No such process
740
521
raise
741
522
self.checker = None
742
523
743
744
524
def dbus_service_property(dbus_interface, signature="v",
745
525
access="readwrite", byte_arrays=False):
746
526
"""Decorators for marking methods of a DBusObjectWithProperties to
792
572
793
573
class DBusObjectWithProperties(dbus.service.Object):
794
574
"""A D-Bus object with properties.
795
575
796
576
Classes inheriting from this can use the dbus_service_property
797
577
decorator to expose methods as D-Bus properties. It exposes the
798
578
standard Get(), Set(), and GetAll() methods on the D-Bus.
805
585
def _get_all_dbus_properties(self):
806
586
"""Returns a generator of (name, attribute) pairs
807
587
"""
808
return ((prop.__get__(self)._dbus_name, prop.__get__(self))
809
for cls in self.__class__.__mro__
588
return ((prop._dbus_name, prop)
810
589
for name, prop in
811
inspect.getmembers(cls, self._is_dbus_property))
590
inspect.getmembers(self, self._is_dbus_property))
812
591
813
592
def _get_dbus_property(self, interface_name, property_name):
814
593
"""Returns a bound method if one exists which is a D-Bus
815
594
property with the specified name and interface.
816
595
"""
817
for cls in self.__class__.__mro__:
818
for name, value in (inspect.getmembers
819
(cls, self._is_dbus_property)):
820
if (value._dbus_name == property_name
821
and value._dbus_interface == interface_name):
822
return value.__get__(self)
823
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
824
606
# No such property
825
607
raise DBusPropertyNotFound(self.dbus_object_path + ":"
826
608
+ interface_name + "."
851
633
# signatures other than "ay".
852
634
if prop._dbus_signature != "ay":
853
635
raise ValueError
854
value = dbus.ByteArray(b''.join(chr(byte)
855
for byte in value))
636
value = dbus.ByteArray(''.join(unichr(byte)
637
for byte in value))
856
638
prop(value)
857
639
858
640
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
860
642
def GetAll(self, interface_name):
861
643
"""Standard D-Bus property GetAll() method, see D-Bus
862
644
standard.
863
645
864
646
Note: Will not include properties with access="write".
865
647
"""
866
properties = {}
648
all = {}
867
649
for name, prop in self._get_all_dbus_properties():
868
650
if (interface_name
869
651
and interface_name != prop._dbus_interface):
874
656
continue
875
657
value = prop()
876
658
if not hasattr(value, "variant_level"):
877
properties[name] = value
659
all[name] = value
878
660
continue
879
properties[name] = type(value)(value, variant_level=
880
value.variant_level+1)
881
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")
882
664
883
665
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
884
666
out_signature="s",
922
704
xmlstring = document.toxml("utf-8")
923
705
document.unlink()
924
706
except (AttributeError, xml.dom.DOMException,
925
xml.parsers.expat.ExpatError) as error:
707
xml.parsers.expat.ExpatError), error:
926
708
logger.error("Failed to override Introspection method",
927
709
error)
928
710
return xmlstring
929
711
930
712
931
def datetime_to_dbus (dt, variant_level=0):
932
"""Convert a UTC datetime.datetime() to a D-Bus type."""
933
if dt is None:
934
return dbus.String("", variant_level = variant_level)
935
return dbus.String(dt.isoformat(),
936
variant_level=variant_level)
937
938
939
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
940
.__metaclass__):
941
"""Applied to an empty subclass of a D-Bus object, this metaclass
942
will add additional D-Bus attributes matching a certain pattern.
943
"""
944
def __new__(mcs, name, bases, attr):
945
# Go through all the base classes which could have D-Bus
946
# methods, signals, or properties in them
947
for base in (b for b in bases
948
if issubclass(b, dbus.service.Object)):
949
# Go though all attributes of the base class
950
for attrname, attribute in inspect.getmembers(base):
951
# Ignore non-D-Bus attributes, and D-Bus attributes
952
# with the wrong interface name
953
if (not hasattr(attribute, "_dbus_interface")
954
or not attribute._dbus_interface
955
.startswith("se.recompile.Mandos")):
956
continue
957
# Create an alternate D-Bus interface name based on
958
# the current name
959
alt_interface = (attribute._dbus_interface
960
.replace("se.recompile.Mandos",
961
"se.bsnet.fukt.Mandos"))
962
# Is this a D-Bus signal?
963
if getattr(attribute, "_dbus_is_signal", False):
964
# Extract the original non-method function by
965
# black magic
966
nonmethod_func = (dict(
967
zip(attribute.func_code.co_freevars,
968
attribute.__closure__))["func"]
969
.cell_contents)
970
# Create a new, but exactly alike, function
971
# object, and decorate it to be a new D-Bus signal
972
# with the alternate D-Bus interface name
973
new_function = (dbus.service.signal
974
(alt_interface,
975
attribute._dbus_signature)
976
(types.FunctionType(
977
nonmethod_func.func_code,
978
nonmethod_func.func_globals,
979
nonmethod_func.func_name,
980
nonmethod_func.func_defaults,
981
nonmethod_func.func_closure)))
982
# Define a creator of a function to call both the
983
# old and new functions, so both the old and new
984
# signals gets sent when the function is called
985
def fixscope(func1, func2):
986
"""This function is a scope container to pass
987
func1 and func2 to the "call_both" function
988
outside of its arguments"""
989
def call_both(*args, **kwargs):
990
"""This function will emit two D-Bus
991
signals by calling func1 and func2"""
992
func1(*args, **kwargs)
993
func2(*args, **kwargs)
994
return call_both
995
# Create the "call_both" function and add it to
996
# the class
997
attr[attrname] = fixscope(attribute,
998
new_function)
999
# Is this a D-Bus method?
1000
elif getattr(attribute, "_dbus_is_method", False):
1001
# Create a new, but exactly alike, function
1002
# object. Decorate it to be a new D-Bus method
1003
# with the alternate D-Bus interface name. Add it
1004
# to the class.
1005
attr[attrname] = (dbus.service.method
1006
(alt_interface,
1007
attribute._dbus_in_signature,
1008
attribute._dbus_out_signature)
1009
(types.FunctionType
1010
(attribute.func_code,
1011
attribute.func_globals,
1012
attribute.func_name,
1013
attribute.func_defaults,
1014
attribute.func_closure)))
1015
# Is this a D-Bus property?
1016
elif getattr(attribute, "_dbus_is_property", False):
1017
# Create a new, but exactly alike, function
1018
# object, and decorate it to be a new D-Bus
1019
# property with the alternate D-Bus interface
1020
# name. Add it to the class.
1021
attr[attrname] = (dbus_service_property
1022
(alt_interface,
1023
attribute._dbus_signature,
1024
attribute._dbus_access,
1025
attribute
1026
._dbus_get_args_options
1027
["byte_arrays"])
1028
(types.FunctionType
1029
(attribute.func_code,
1030
attribute.func_globals,
1031
attribute.func_name,
1032
attribute.func_defaults,
1033
attribute.func_closure)))
1034
return type.__new__(mcs, name, bases, attr)
1035
1036
1037
713
class ClientDBus(Client, DBusObjectWithProperties):
1038
714
"""A Client class using D-Bus
1039
715
1048
724
# dbus.service.Object doesn't use super(), so we can't either.
1049
725
1050
726
def __init__(self, bus = None, *args, **kwargs):
727
self._approvals_pending = 0
1051
728
self.bus = bus
1052
729
Client.__init__(self, *args, **kwargs)
1053
730
# Only now, when this client is initialized, can it show up on
1060
737
DBusObjectWithProperties.__init__(self, self.bus,
1061
738
self.dbus_object_path)
1062
739
1063
def notifychangeproperty(transform_func,
1064
dbus_name, type_func=lambda x: x,
1065
variant_level=1):
1066
""" Modify a variable so that it's a property which announces
1067
its changes to DBus.
1068
1069
transform_fun: Function that takes a value and a variant_level
1070
and transforms it to a D-Bus type.
1071
dbus_name: D-Bus name of the variable
1072
type_func: Function that transform the value before sending it
1073
to the D-Bus. Default: no transform
1074
variant_level: D-Bus variant level. Default: 1
1075
"""
1076
attrname = "_{0}".format(dbus_name)
1077
def setter(self, value):
1078
if hasattr(self, "dbus_object_path"):
1079
if (not hasattr(self, attrname) or
1080
type_func(getattr(self, attrname, None))
1081
!= type_func(value)):
1082
dbus_value = transform_func(type_func(value),
1083
variant_level
1084
=variant_level)
1085
self.PropertyChanged(dbus.String(dbus_name),
1086
dbus_value)
1087
setattr(self, attrname, value)
1088
1089
return property(lambda self: getattr(self, attrname), setter)
1090
1091
1092
expires = notifychangeproperty(datetime_to_dbus, "Expires")
1093
approvals_pending = notifychangeproperty(dbus.Boolean,
1094
"ApprovalPending",
1095
type_func = bool)
1096
enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1097
last_enabled = notifychangeproperty(datetime_to_dbus,
1098
"LastEnabled")
1099
checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
1100
type_func = lambda checker:
1101
checker is not None)
1102
last_checked_ok = notifychangeproperty(datetime_to_dbus,
1103
"LastCheckedOK")
1104
last_checker_status = notifychangeproperty(dbus.Int16,
1105
"LastCheckerStatus")
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
1237
922
# CheckedOK - method
1238
923
@dbus.service.method(_interface)
1239
924
def CheckedOK(self):
1240
self.checked_ok()
925
return self.checked_ok()
1241
926
1242
927
# Enable - method
1243
928
@dbus.service.method(_interface)
1276
961
if value is None: # get
1277
962
return dbus.Boolean(self.approved_by_default)
1278
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))
1279
967
1280
968
# ApprovalDelay - property
1281
969
@dbus_service_property(_interface, signature="t",
1284
972
if value is None: # get
1285
973
return dbus.UInt64(self.approval_delay_milliseconds())
1286
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))
1287
978
1288
979
# ApprovalDuration - property
1289
980
@dbus_service_property(_interface, signature="t",
1290
981
access="readwrite")
1291
982
def ApprovalDuration_dbus_property(self, value=None):
1292
983
if value is None: # get
1293
return dbus.UInt64(timedelta_to_milliseconds(
984
return dbus.UInt64(self._timedelta_to_milliseconds(
1294
985
self.approval_duration))
1295
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))
1296
990
1297
991
# Name - property
1298
992
@dbus_service_property(_interface, signature="s", access="read")
1310
1004
def Host_dbus_property(self, value=None):
1311
1005
if value is None: # get
1312
1006
return dbus.String(self.host)
1313
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))
1314
1011
1315
1012
# Created - property
1316
1013
@dbus_service_property(_interface, signature="s", access="read")
1317
1014
def Created_dbus_property(self):
1318
return datetime_to_dbus(self.created)
1015
return dbus.String(self._datetime_to_dbus(self.created))
1319
1016
1320
1017
# LastEnabled - property
1321
1018
@dbus_service_property(_interface, signature="s", access="read")
1322
1019
def LastEnabled_dbus_property(self):
1323
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))
1324
1023
1325
1024
# Enabled - property
1326
1025
@dbus_service_property(_interface, signature="b",
1340
1039
if value is not None:
1341
1040
self.checked_ok()
1342
1041
return
1343
return datetime_to_dbus(self.last_checked_ok)
1344
1345
# LastCheckerStatus - property
1346
@dbus_service_property(_interface, signature="n",
1347
access="read")
1348
def LastCheckerStatus_dbus_property(self):
1349
return dbus.Int16(self.last_checker_status)
1350
1351
# Expires - property
1352
@dbus_service_property(_interface, signature="s", access="read")
1353
def Expires_dbus_property(self):
1354
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))
1355
1046
1356
1047
# LastApprovalRequest - property
1357
1048
@dbus_service_property(_interface, signature="s", access="read")
1358
1049
def LastApprovalRequest_dbus_property(self):
1359
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))
1360
1055
1361
1056
# Timeout - property
1362
1057
@dbus_service_property(_interface, signature="t",
1365
1060
if value is None: # get
1366
1061
return dbus.UInt64(self.timeout_milliseconds())
1367
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
1368
1068
# Reschedule timeout
1369
if self.enabled:
1370
now = datetime.datetime.utcnow()
1371
time_to_die = timedelta_to_milliseconds(
1372
(self.last_checked_ok + self.timeout) - now)
1373
if time_to_die <= 0:
1374
# The timeout has passed
1375
self.disable()
1376
else:
1377
self.expires = (now +
1378
datetime.timedelta(milliseconds =
1379
time_to_die))
1380
if (getattr(self, "disable_initiator_tag", None)
1381
is None):
1382
return
1383
gobject.source_remove(self.disable_initiator_tag)
1384
self.disable_initiator_tag = (gobject.timeout_add
1385
(time_to_die,
1386
self.disable))
1387
1388
# ExtendedTimeout - property
1389
@dbus_service_property(_interface, signature="t",
1390
access="readwrite")
1391
def ExtendedTimeout_dbus_property(self, value=None):
1392
if value is None: # get
1393
return dbus.UInt64(self.extended_timeout_milliseconds())
1394
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))
1395
1083
1396
1084
# Interval - property
1397
1085
@dbus_service_property(_interface, signature="t",
1400
1088
if value is None: # get
1401
1089
return dbus.UInt64(self.interval_milliseconds())
1402
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))
1403
1094
if getattr(self, "checker_initiator_tag", None) is None:
1404
1095
return
1405
if self.enabled:
1406
# Reschedule checker run
1407
gobject.source_remove(self.checker_initiator_tag)
1408
self.checker_initiator_tag = (gobject.timeout_add
1409
(value, self.start_checker))
1410
self.start_checker() # Start one now, too
1411
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
1412
1102
# Checker - property
1413
1103
@dbus_service_property(_interface, signature="s",
1414
1104
access="readwrite")
1415
1105
def Checker_dbus_property(self, value=None):
1416
1106
if value is None: # get
1417
1107
return dbus.String(self.checker_command)
1418
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))
1419
1113
1420
1114
# CheckerRunning - property
1421
1115
@dbus_service_property(_interface, signature="b",
1448
1142
self._pipe.send(('init', fpr, address))
1449
1143
if not self._pipe.recv():
1450
1144
raise KeyError()
1451
1145
1452
1146
def __getattribute__(self, name):
1453
if name == '_pipe':
1147
if(name == '_pipe'):
1454
1148
return super(ProxyClient, self).__getattribute__(name)
1455
1149
self._pipe.send(('getattr', name))
1456
1150
data = self._pipe.recv()
1461
1155
self._pipe.send(('funcall', name, args, kwargs))
1462
1156
return self._pipe.recv()[1]
1463
1157
return func
1464
1158
1465
1159
def __setattr__(self, name, value):
1466
if name == '_pipe':
1160
if(name == '_pipe'):
1467
1161
return super(ProxyClient, self).__setattr__(name, value)
1468
1162
self._pipe.send(('setattr', name, value))
1469
1163
1470
1164
1471
class ClientDBusTransitional(ClientDBus):
1472
__metaclass__ = AlternateDBusNamesMetaclass
1473
1474
1475
1165
class ClientHandler(socketserver.BaseRequestHandler, object):
1476
1166
"""A class to handle client connections.
1477
1167
1484
1174
unicode(self.client_address))
1485
1175
logger.debug("Pipe FD: %d",
1486
1176
self.server.child_pipe.fileno())
1487
1177
1488
1178
session = (gnutls.connection
1489
1179
.ClientSession(self.request,
1490
1180
gnutls.connection
1491
1181
.X509Credentials()))
1492
1182
1493
1183
# Note: gnutls.connection.X509Credentials is really a
1494
1184
# generic GnuTLS certificate credentials object so long as
1495
1185
# no X.509 keys are added to it. Therefore, we can use it
1496
1186
# here despite using OpenPGP certificates.
1497
1187
1498
1188
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1499
1189
# "+AES-256-CBC", "+SHA1",
1500
1190
# "+COMP-NULL", "+CTYPE-OPENPGP",
1506
1196
(gnutls.library.functions
1507
1197
.gnutls_priority_set_direct(session._c_object,
1508
1198
priority, None))
1509
1199
1510
1200
# Start communication using the Mandos protocol
1511
1201
# Get protocol number
1512
1202
line = self.request.makefile().readline()
1514
1204
try:
1515
1205
if int(line.strip().split()[0]) > 1:
1516
1206
raise RuntimeError
1517
except (ValueError, IndexError, RuntimeError) as error:
1207
except (ValueError, IndexError, RuntimeError), error:
1518
1208
logger.error("Unknown protocol version: %s", error)
1519
1209
return
1520
1210
1521
1211
# Start GnuTLS connection
1522
1212
try:
1523
1213
session.handshake()
1524
except gnutls.errors.GNUTLSError as error:
1214
except gnutls.errors.GNUTLSError, error:
1525
1215
logger.warning("Handshake failed: %s", error)
1526
1216
# Do not run session.bye() here: the session is not
1527
1217
# established. Just abandon the request.
1528
1218
return
1529
1219
logger.debug("Handshake succeeded")
1530
1220
1531
1221
approval_required = False
1532
1222
try:
1533
1223
try:
1534
1224
fpr = self.fingerprint(self.peer_certificate
1535
1225
(session))
1536
except (TypeError,
1537
gnutls.errors.GNUTLSError) as error:
1226
except (TypeError, gnutls.errors.GNUTLSError), error:
1538
1227
logger.warning("Bad certificate: %s", error)
1539
1228
return
1540
1229
logger.debug("Fingerprint: %s", fpr)
1541
1230
1542
1231
try:
1543
1232
client = ProxyClient(child_pipe, fpr,
1544
1233
self.client_address)
1552
1241
1553
1242
while True:
1554
1243
if not client.enabled:
1555
logger.info("Client %s is disabled",
1244
logger.warning("Client %s is disabled",
1556
1245
client.name)
1557
1246
if self.server.use_dbus:
1558
1247
# Emit D-Bus signal
1559
client.Rejected("Disabled")
1248
client.Rejected("Disabled")
1560
1249
return
1561
1250
1562
if client.approved or not client.approval_delay:
1251
if client._approved or not client.approval_delay:
1563
1252
#We are approved or approval is disabled
1564
1253
break
1565
elif client.approved is None:
1254
elif client._approved is None:
1566
1255
logger.info("Client %s needs approval",
1567
1256
client.name)
1568
1257
if self.server.use_dbus:
1579
1268
return
1580
1269
1581
1270
#wait until timeout or approved
1271
#x = float(client._timedelta_to_milliseconds(delay))
1582
1272
time = datetime.datetime.now()
1583
1273
client.changedstate.acquire()
1584
(client.changedstate.wait
1585
(float(client.timedelta_to_milliseconds(delay)
1586
/ 1000)))
1274
client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
1587
1275
client.changedstate.release()
1588
1276
time2 = datetime.datetime.now()
1589
1277
if (time2 - time) >= delay:
1604
1292
while sent_size < len(client.secret):
1605
1293
try:
1606
1294
sent = session.send(client.secret[sent_size:])
1607
except gnutls.errors.GNUTLSError as error:
1295
except (gnutls.errors.GNUTLSError), error:
1608
1296
logger.warning("gnutls send failed")
1609
1297
return
1610
1298
logger.debug("Sent: %d, remaining: %d",
1611
1299
sent, len(client.secret)
1612
1300
- (sent_size + sent))
1613
1301
sent_size += sent
1614
1302
1615
1303
logger.info("Sending secret to %s", client.name)
1616
# bump the timeout using extended_timeout
1617
client.bump_timeout(client.extended_timeout)
1304
# bump the timeout as if seen
1305
client.checked_ok()
1618
1306
if self.server.use_dbus:
1619
1307
# Emit D-Bus signal
1620
1308
client.GotSecret()
1624
1312
client.approvals_pending -= 1
1625
1313
try:
1626
1314
session.bye()
1627
except gnutls.errors.GNUTLSError as error:
1315
except (gnutls.errors.GNUTLSError), error:
1628
1316
logger.warning("GnuTLS bye failed")
1629
1317
1630
1318
@staticmethod
1687
1375
# Convert the buffer to a Python bytestring
1688
1376
fpr = ctypes.string_at(buf, buf_len.value)
1689
1377
# Convert the bytestring to hexadecimal notation
1690
hex_fpr = binascii.hexlify(fpr).upper()
1378
hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
1691
1379
return hex_fpr
1692
1380
1693
1381
1696
1384
def sub_process_main(self, request, address):
1697
1385
try:
1698
1386
self.finish_request(request, address)
1699
except Exception:
1387
except:
1700
1388
self.handle_error(request, address)
1701
1389
self.close_request(request)
1702
1390
1703
1391
def process_request(self, request, address):
1704
1392
"""Start a new process to process the request."""
1705
proc = multiprocessing.Process(target = self.sub_process_main,
1706
args = (request,
1707
address))
1708
proc.start()
1709
return proc
1710
1393
multiprocessing.Process(target = self.sub_process_main,
1394
args = (request, address)).start()
1711
1395
1712
1396
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1713
1397
""" adds a pipe to the MixIn """
1717
1401
This function creates a new pipe in self.pipe
1718
1402
"""
1719
1403
parent_pipe, self.child_pipe = multiprocessing.Pipe()
1720
1721
proc = MultiprocessingMixIn.process_request(self, request,
1722
client_address)
1404
1405
super(MultiprocessingMixInWithPipe,
1406
self).process_request(request, client_address)
1723
1407
self.child_pipe.close()
1724
self.add_pipe(parent_pipe, proc)
1725
1726
def add_pipe(self, parent_pipe, proc):
1408
self.add_pipe(parent_pipe)
1409
1410
def add_pipe(self, parent_pipe):
1727
1411
"""Dummy function; override as necessary"""
1728
1412
raise NotImplementedError
1729
1413
1730
1731
1414
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1732
1415
socketserver.TCPServer, object):
1733
1416
"""IPv6-capable TCP server. Accepts 'None' as address and/or port
1759
1442
SO_BINDTODEVICE,
1760
1443
str(self.interface
1761
1444
+ '\0'))
1762
except socket.error as error:
1445
except socket.error, error:
1763
1446
if error[0] == errno.EPERM:
1764
1447
logger.error("No permission to"
1765
1448
" bind to interface %s",
1807
1490
self.enabled = False
1808
1491
self.clients = clients
1809
1492
if self.clients is None:
1810
self.clients = {}
1493
self.clients = set()
1811
1494
self.use_dbus = use_dbus
1812
1495
self.gnutls_priority = gnutls_priority
1813
1496
IPv6_TCPServer.__init__(self, server_address,
1817
1500
def server_activate(self):
1818
1501
if self.enabled:
1819
1502
return socketserver.TCPServer.server_activate(self)
1820
1821
1503
def enable(self):
1822
1504
self.enabled = True
1823
1824
def add_pipe(self, parent_pipe, proc):
1505
def add_pipe(self, parent_pipe):
1825
1506
# Call "handle_ipc" for both data and EOF events
1826
1507
gobject.io_add_watch(parent_pipe.fileno(),
1827
1508
gobject.IO_IN | gobject.IO_HUP,
1828
1509
functools.partial(self.handle_ipc,
1829
parent_pipe =
1830
parent_pipe,
1831
proc = proc))
1832
1510
parent_pipe = parent_pipe))
1511
1833
1512
def handle_ipc(self, source, condition, parent_pipe=None,
1834
proc = None, client_object=None):
1513
client_object=None):
1835
1514
condition_names = {
1836
1515
gobject.IO_IN: "IN", # There is data to read.
1837
1516
gobject.IO_OUT: "OUT", # Data can be written (without
1846
1525
for cond, name in
1847
1526
condition_names.iteritems()
1848
1527
if cond & condition)
1849
# error, or the other end of multiprocessing.Pipe has closed
1528
# error or the other end of multiprocessing.Pipe has closed
1850
1529
if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
1851
# Wait for other process to exit
1852
proc.join()
1853
1530
return False
1854
1531
1855
1532
# Read a request from the child
1860
1537
fpr = request[1]
1861
1538
address = request[2]
1862
1539
1863
for c in self.clients.itervalues():
1540
for c in self.clients:
1864
1541
if c.fingerprint == fpr:
1865
1542
client = c
1866
1543
break
1867
1544
else:
1868
logger.info("Client not found for fingerprint: %s, ad"
1869
"dress: %s", fpr, address)
1545
logger.warning("Client not found for fingerprint: %s, ad"
1546
"dress: %s", fpr, address)
1870
1547
if self.use_dbus:
1871
1548
# Emit D-Bus signal
1872
mandos_dbus_service.ClientNotFound(fpr,
1873
address[0])
1549
mandos_dbus_service.ClientNotFound(fpr, address[0])
1874
1550
parent_pipe.send(False)
1875
1551
return False
1876
1552
1877
1553
gobject.io_add_watch(parent_pipe.fileno(),
1878
1554
gobject.IO_IN | gobject.IO_HUP,
1879
1555
functools.partial(self.handle_ipc,
1880
parent_pipe =
1881
parent_pipe,
1882
proc = proc,
1883
client_object =
1884
client))
1556
parent_pipe = parent_pipe,
1557
client_object = client))
1885
1558
parent_pipe.send(True)
1886
# remove the old hook in favor of the new above hook on
1887
# same fileno
1559
# remove the old hook in favor of the new above hook on same fileno
1888
1560
return False
1889
1561
if command == 'funcall':
1890
1562
funcname = request[1]
1891
1563
args = request[2]
1892
1564
kwargs = request[3]
1893
1565
1894
parent_pipe.send(('data', getattr(client_object,
1895
funcname)(*args,
1896
**kwargs)))
1897
1566
parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
1567
1898
1568
if command == 'getattr':
1899
1569
attrname = request[1]
1900
1570
if callable(client_object.__getattribute__(attrname)):
1901
1571
parent_pipe.send(('function',))
1902
1572
else:
1903
parent_pipe.send(('data', client_object
1904
.__getattribute__(attrname)))
1573
parent_pipe.send(('data', client_object.__getattribute__(attrname)))
1905
1574
1906
1575
if command == 'setattr':
1907
1576
attrname = request[1]
1908
1577
value = request[2]
1909
1578
setattr(client_object, attrname, value)
1910
1579
1911
1580
return True
1912
1581
1913
1582
1944
1613
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1945
1614
else:
1946
1615
raise ValueError("Unknown suffix %r" % suffix)
1947
except (ValueError, IndexError) as e:
1616
except (ValueError, IndexError), e:
1948
1617
raise ValueError(*(e.args))
1949
1618
timevalue += delta
1950
1619
return timevalue
1951
1620
1952
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
1953
1646
def daemon(nochdir = False, noclose = False):
1954
1647
"""See daemon(3). Standard BSD Unix function.
1955
1648
1980
1673
##################################################################
1981
1674
# Parsing of options, both command line and config file
1982
1675
1983
parser = argparse.ArgumentParser()
1984
parser.add_argument("-v", "--version", action="version",
1985
version = "%%(prog)s %s" % version,
1986
help="show version number and exit")
1987
parser.add_argument("-i", "--interface", metavar="IF",
1988
help="Bind to interface IF")
1989
parser.add_argument("-a", "--address",
1990
help="Address to listen for requests on")
1991
parser.add_argument("-p", "--port", type=int,
1992
help="Port number to receive requests on")
1993
parser.add_argument("--check", action="store_true",
1994
help="Run self-test")
1995
parser.add_argument("--debug", action="store_true",
1996
help="Debug mode; run in foreground and log"
1997
" to terminal")
1998
parser.add_argument("--debuglevel", metavar="LEVEL",
1999
help="Debug level for stdout output")
2000
parser.add_argument("--priority", help="GnuTLS"
2001
" priority string (see GnuTLS documentation)")
2002
parser.add_argument("--servicename",
2003
metavar="NAME", help="Zeroconf service name")
2004
parser.add_argument("--configdir",
2005
default="/etc/mandos", metavar="DIR",
2006
help="Directory to search for configuration"
2007
" files")
2008
parser.add_argument("--no-dbus", action="store_false",
2009
dest="use_dbus", help="Do not provide D-Bus"
2010
" system bus interface")
2011
parser.add_argument("--no-ipv6", action="store_false",
2012
dest="use_ipv6", help="Do not use IPv6")
2013
parser.add_argument("--no-restore", action="store_false",
2014
dest="restore", help="Do not restore stored"
2015
" state")
2016
parser.add_argument("--statedir", metavar="DIR",
2017
help="Directory to save/restore state in")
2018
2019
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]
2020
1704
2021
1705
if options.check:
2022
1706
import doctest
2034
1718
"use_dbus": "True",
2035
1719
"use_ipv6": "True",
2036
1720
"debuglevel": "",
2037
"restore": "True",
2038
"statedir": "/var/lib/mandos"
2039
1721
}
2040
1722
2041
1723
# Parse config file for server-global settings
2058
1740
# options, if set.
2059
1741
for option in ("interface", "address", "port", "debug",
2060
1742
"priority", "servicename", "configdir",
2061
"use_dbus", "use_ipv6", "debuglevel", "restore",
2062
"statedir"):
1743
"use_dbus", "use_ipv6", "debuglevel"):
2063
1744
value = getattr(options, option)
2064
1745
if value is not None:
2065
1746
server_settings[option] = value
2077
1758
debuglevel = server_settings["debuglevel"]
2078
1759
use_dbus = server_settings["use_dbus"]
2079
1760
use_ipv6 = server_settings["use_ipv6"]
2080
stored_state_path = os.path.join(server_settings["statedir"],
2081
stored_state_file)
2082
2083
if debug:
2084
initlogger(debug, logging.DEBUG)
2085
else:
2086
if not debuglevel:
2087
initlogger(debug)
2088
else:
2089
level = getattr(logging, debuglevel.upper())
2090
initlogger(debug, level)
2091
1761
2092
1762
if server_settings["servicename"] != "Mandos":
2093
1763
syslogger.setFormatter(logging.Formatter
2094
1764
('Mandos (%s) [%%(process)d]:'
2096
1766
% server_settings["servicename"]))
2097
1767
2098
1768
# Parse config file with clients
2099
client_config = configparser.SafeConfigParser(Client
2100
.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)
2101
1777
client_config.read(os.path.join(server_settings["configdir"],
2102
1778
"clients.conf"))
2103
1779
2137
1813
try:
2138
1814
os.setgid(gid)
2139
1815
os.setuid(uid)
2140
except OSError as error:
1816
except OSError, error:
2141
1817
if error[0] != errno.EPERM:
2142
1818
raise error
2143
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
2144
1828
if debug:
2145
1829
# Enable all possible GnuTLS debugging
2146
1830
2160
1844
os.dup2(null, sys.stdin.fileno())
2161
1845
if null > 2:
2162
1846
os.close(null)
1847
else:
1848
# No console logging
1849
logger.removeHandler(console)
2163
1850
2164
1851
# Need to fork before connecting to D-Bus
2165
1852
if not debug:
2166
1853
# Close all input and output, do double fork, etc.
2167
1854
daemon()
2168
1855
2169
gobject.threads_init()
2170
2171
1856
global main_loop
2172
1857
# From the Avahi example code
2173
1858
DBusGMainLoop(set_as_default=True )
2176
1861
# End of Avahi example code
2177
1862
if use_dbus:
2178
1863
try:
2179
bus_name = dbus.service.BusName("se.recompile.Mandos",
1864
bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
2180
1865
bus, do_not_queue=True)
2181
old_bus_name = (dbus.service.BusName
2182
("se.bsnet.fukt.Mandos", bus,
2183
do_not_queue=True))
2184
except dbus.exceptions.NameExistsException as e:
1866
except dbus.exceptions.NameExistsException, e:
2185
1867
logger.error(unicode(e) + ", disabling D-Bus")
2186
1868
use_dbus = False
2187
1869
server_settings["use_dbus"] = False
2188
1870
tcp_server.use_dbus = False
2189
1871
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2190
service = AvahiServiceToSyslog(name =
2191
server_settings["servicename"],
2192
servicetype = "_mandos._tcp",
2193
protocol = protocol, bus = bus)
1872
service = AvahiService(name = server_settings["servicename"],
1873
servicetype = "_mandos._tcp",
1874
protocol = protocol, bus = bus)
2194
1875
if server_settings["interface"]:
2195
1876
service.interface = (if_nametoindex
2196
1877
(str(server_settings["interface"])))
2200
1881
2201
1882
client_class = Client
2202
1883
if use_dbus:
2203
client_class = functools.partial(ClientDBusTransitional,
2204
bus = bus)
2205
2206
client_settings = Client.config_parser(client_config)
2207
old_client_settings = {}
2208
clients_data = {}
2209
2210
# Get client data and settings from last running state.
2211
if server_settings["restore"]:
2212
try:
2213
with open(stored_state_path, "rb") as stored_state:
2214
clients_data, old_client_settings = (pickle.load
2215
(stored_state))
2216
os.remove(stored_state_path)
2217
except IOError as e:
2218
logger.warning("Could not load persistent state: {0}"
2219
.format(e))
2220
if e.errno != errno.ENOENT:
2221
raise
2222
except EOFError as e:
2223
logger.warning("Could not load persistent state: "
2224
"EOFError: {0}".format(e))
2225
2226
with PGPEngine() as pgp:
2227
for client_name, client in clients_data.iteritems():
2228
# Decide which value to use after restoring saved state.
2229
# We have three different values: Old config file,
2230
# new config file, and saved state.
2231
# New config value takes precedence if it differs from old
2232
# config value, otherwise use saved state.
2233
for name, value in client_settings[client_name].items():
2234
try:
2235
# For each value in new config, check if it
2236
# differs from the old config value (Except for
2237
# the "secret" attribute)
2238
if (name != "secret" and
2239
value != old_client_settings[client_name]
2240
[name]):
2241
client[name] = value
2242
except KeyError:
2243
pass
2244
2245
# Clients who has passed its expire date can still be
2246
# enabled if its last checker was successful. Clients
2247
# whose checker succeeded before we stored its state is
2248
# assumed to have successfully run all checkers during
2249
# downtime.
2250
if client["enabled"]:
2251
if datetime.datetime.utcnow() >= client["expires"]:
2252
if not client["last_checked_ok"]:
2253
logger.warning(
2254
"disabling client {0} - Client never "
2255
"performed a successful checker"
2256
.format(client_name))
2257
client["enabled"] = False
2258
elif client["last_checker_status"] != 0:
2259
logger.warning(
2260
"disabling client {0} - Client "
2261
"last checker failed with error code {1}"
2262
.format(client_name,
2263
client["last_checker_status"]))
2264
client["enabled"] = False
2265
else:
2266
client["expires"] = (datetime.datetime
2267
.utcnow()
2268
+ client["timeout"])
2269
logger.debug("Last checker succeeded,"
2270
" keeping {0} enabled"
2271
.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):
2272
1892
try:
2273
client["secret"] = (
2274
pgp.decrypt(client["encrypted_secret"],
2275
client_settings[client_name]
2276
["secret"]))
2277
except PGPError:
2278
# If decryption fails, we use secret from new settings
2279
logger.debug("Failed to decrypt {0} old secret"
2280
.format(client_name))
2281
client["secret"] = (
2282
client_settings[client_name]["secret"])
2283
2284
2285
# Add/remove clients based on new changes made to config
2286
for client_name in (set(old_client_settings)
2287
- set(client_settings)):
2288
del clients_data[client_name]
2289
for client_name in (set(client_settings)
2290
- set(old_client_settings)):
2291
clients_data[client_name] = client_settings[client_name]
2292
2293
# Create all client objects
2294
for client_name, client in clients_data.iteritems():
2295
tcp_server.clients[client_name] = client_class(
2296
name = client_name, settings = client)
2297
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()))
2298
1902
if not tcp_server.clients:
2299
1903
logger.warning("No clients defined")
2300
1904
2311
1915
# "pidfile" was never created
2312
1916
pass
2313
1917
del pidfilename
1918
2314
1919
signal.signal(signal.SIGINT, signal.SIG_IGN)
2315
1920
2316
1921
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2317
1922
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2318
1923
2321
1926
"""A D-Bus proxy object"""
2322
1927
def __init__(self):
2323
1928
dbus.service.Object.__init__(self, bus, "/")
2324
_interface = "se.recompile.Mandos"
1929
_interface = "se.bsnet.fukt.Mandos"
2325
1930
2326
1931
@dbus.service.signal(_interface, signature="o")
2327
1932
def ClientAdded(self, objpath):
2342
1947
def GetAllClients(self):
2343
1948
"D-Bus method"
2344
1949
return dbus.Array(c.dbus_object_path
2345
for c in
2346
tcp_server.clients.itervalues())
1950
for c in tcp_server.clients)
2347
1951
2348
1952
@dbus.service.method(_interface,
2349
1953
out_signature="a{oa{sv}}")
2351
1955
"D-Bus method"
2352
1956
return dbus.Dictionary(
2353
1957
((c.dbus_object_path, c.GetAll(""))
2354
for c in tcp_server.clients.itervalues()),
1958
for c in tcp_server.clients),
2355
1959
signature="oa{sv}")
2356
1960
2357
1961
@dbus.service.method(_interface, in_signature="o")
2358
1962
def RemoveClient(self, object_path):
2359
1963
"D-Bus method"
2360
for c in tcp_server.clients.itervalues():
1964
for c in tcp_server.clients:
2361
1965
if c.dbus_object_path == object_path:
2362
del tcp_server.clients[c.name]
1966
tcp_server.clients.remove(c)
2363
1967
c.remove_from_connection()
2364
1968
# Don't signal anything except ClientRemoved
2365
1969
c.disable(quiet=True)
2370
1974
2371
1975
del _interface
2372
1976
2373
class MandosDBusServiceTransitional(MandosDBusService):
2374
__metaclass__ = AlternateDBusNamesMetaclass
2375
mandos_dbus_service = MandosDBusServiceTransitional()
1977
mandos_dbus_service = MandosDBusService()
2376
1978
2377
1979
def cleanup():
2378
1980
"Cleanup function; run on exit"
2379
1981
service.cleanup()
2380
1982
2381
multiprocessing.active_children()
2382
if not (tcp_server.clients or client_settings):
2383
return
2384
2385
# Store client before exiting. Secrets are encrypted with key
2386
# based on what config file has. If config file is
2387
# removed/edited, old secret will thus be unrecovable.
2388
clients = {}
2389
with PGPEngine() as pgp:
2390
for client in tcp_server.clients.itervalues():
2391
key = client_settings[client.name]["secret"]
2392
client.encrypted_secret = pgp.encrypt(client.secret,
2393
key)
2394
client_dict = {}
2395
2396
# A list of attributes that can not be pickled
2397
# + secret.
2398
exclude = set(("bus", "changedstate", "secret",
2399
"checker"))
2400
for name, typ in (inspect.getmembers
2401
(dbus.service.Object)):
2402
exclude.add(name)
2403
2404
client_dict["encrypted_secret"] = (client
2405
.encrypted_secret)
2406
for attr in client.client_structure:
2407
if attr not in exclude:
2408
client_dict[attr] = getattr(client, attr)
2409
2410
clients[client.name] = client_dict
2411
del client_settings[client.name]["secret"]
2412
2413
try:
2414
tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
2415
prefix="clients-",
2416
dir=os.path.dirname
2417
(stored_state_path))
2418
with os.fdopen(tempfd, "wb") as stored_state:
2419
pickle.dump((clients, client_settings), stored_state)
2420
os.rename(tempname, stored_state_path)
2421
except (IOError, OSError) as e:
2422
logger.warning("Could not save persistent state: {0}"
2423
.format(e))
2424
if not debug:
2425
try:
2426
os.remove(tempname)
2427
except NameError:
2428
pass
2429
if e.errno not in set((errno.ENOENT, errno.EACCES,
2430
errno.EEXIST)):
2431
raise e
2432
2433
# Delete all clients, and settings from config
2434
1983
while tcp_server.clients:
2435
name, client = tcp_server.clients.popitem()
1984
client = tcp_server.clients.pop()
2436
1985
if use_dbus:
2437
1986
client.remove_from_connection()
1987
client.disable_hook = None
2438
1988
# Don't signal anything except ClientRemoved
2439
1989
client.disable(quiet=True)
2440
1990
if use_dbus:
2441
1991
# Emit D-Bus signal
2442
mandos_dbus_service.ClientRemoved(client
2443
.dbus_object_path,
1992
mandos_dbus_service.ClientRemoved(client.dbus_object_path,
2444
1993
client.name)
2445
client_settings.clear()
2446
1994
2447
1995
atexit.register(cleanup)
2448
1996
2449
for client in tcp_server.clients.itervalues():
1997
for client in tcp_server.clients:
2450
1998
if use_dbus:
2451
1999
# Emit D-Bus signal
2452
2000
mandos_dbus_service.ClientAdded(client.dbus_object_path)
2453
# Need to initiate checking of clients
2454
if client.enabled:
2455
client.init_checker()
2001
client.enable()
2456
2002
2457
2003
tcp_server.enable()
2458
2004
tcp_server.server_activate()
2473
2019
# From the Avahi example code
2474
2020
try:
2475
2021
service.activate()
2476
except dbus.exceptions.DBusException as error:
2022
except dbus.exceptions.DBusException, error:
2477
2023
logger.critical("DBusException: %s", error)
2478
2024
cleanup()
2479
2025
sys.exit(1)
2486
2032
2487
2033
logger.debug("Starting main loop")
2488
2034
main_loop.run()
2489
except AvahiError as error:
2035
except AvahiError, error:
2490
2036
logger.critical("AvahiError: %s", error)
2491
2037
cleanup()
2492
2038
sys.exit(1)
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0