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 518.1.5
- compare with another revision
- download diff
- download tarball
- view history from revision 518.1.5
- Committer: Björn Påhlsson
- Date: 2011-11-24 19:27:53 UTC
- mto: (518.2.5 persistent-state-gpgme)
- mto: This revision was merged to the branch mainline in revision 524.
- Revision ID: belorn@fukt.bsnet.se-20111124192753-y5jxlc1h3tcxpubc
First run of python-lint. Fixed some *obviously* bad code and turned
them into good code.
them into good code.
- files added:
- debian/source/local-options
- 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-2010 Teddy Hogeborn
15
# Copyright © 2008-2010 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@fukt.bsnet.se>.
31
# Contact the authors at <mandos@recompile.se>.
32
32
#
33
33
34
from __future__ import division, with_statement, absolute_import
34
from __future__ import (division, absolute_import, print_function,
35
unicode_literals)
35
36
36
37
import SocketServer as socketserver
37
38
import socket
38
import optparse
39
import argparse
39
40
import datetime
40
41
import errno
41
42
import gnutls.crypto
61
62
import functools
62
63
import cPickle as pickle
63
64
import multiprocessing
65
import types
66
import hashlib
64
67
65
68
import dbus
66
69
import dbus.service
71
74
import ctypes.util
72
75
import xml.dom.minidom
73
76
import inspect
77
import Crypto.Cipher.AES
74
78
75
79
try:
76
80
SO_BINDTODEVICE = socket.SO_BINDTODEVICE
81
85
SO_BINDTODEVICE = None
82
86
83
87
84
version = "1.2.1"
88
version = "1.4.1"
89
stored_state_path = "/var/lib/mandos/clients.pickle"
85
90
86
#logger = logging.getLogger(u'mandos')
87
logger = logging.Logger(u'mandos')
91
logger = logging.getLogger()
88
92
syslogger = (logging.handlers.SysLogHandler
89
93
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
90
address = "/dev/log"))
91
syslogger.setFormatter(logging.Formatter
92
(u'Mandos [%(process)d]: %(levelname)s:'
93
u' %(message)s'))
94
logger.addHandler(syslogger)
95
96
console = logging.StreamHandler()
97
console.setFormatter(logging.Formatter(u'%(name)s [%(process)d]:'
98
u' %(levelname)s:'
99
u' %(message)s'))
100
logger.addHandler(console)
94
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(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
console = logging.StreamHandler()
122
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
123
' [%(process)d]:'
124
' %(levelname)s:'
125
' %(message)s'))
126
logger.addHandler(console)
127
logger.setLevel(level)
128
101
129
102
130
class AvahiError(Exception):
103
131
def __init__(self, value, *args, **kwargs):
119
147
Attributes:
120
148
interface: integer; avahi.IF_UNSPEC or an interface index.
121
149
Used to optionally bind to the specified interface.
122
name: string; Example: u'Mandos'
123
type: string; Example: u'_mandos._tcp'.
150
name: string; Example: 'Mandos'
151
type: string; Example: '_mandos._tcp'.
124
152
See <http://www.dns-sd.org/ServiceTypes.html>
125
153
port: integer; what port to announce
126
154
TXT: list of strings; TXT record for the service
135
163
"""
136
164
def __init__(self, interface = avahi.IF_UNSPEC, name = None,
137
165
servicetype = None, port = None, TXT = None,
138
domain = u"", host = u"", max_renames = 32768,
166
domain = "", host = "", max_renames = 32768,
139
167
protocol = avahi.PROTO_UNSPEC, bus = None):
140
168
self.interface = interface
141
169
self.name = name
150
178
self.group = None # our entry group
151
179
self.server = None
152
180
self.bus = bus
181
self.entry_group_state_changed_match = None
153
182
def rename(self):
154
183
"""Derived from the Avahi example code"""
155
184
if self.rename_count >= self.max_renames:
156
logger.critical(u"No suitable Zeroconf service name found"
157
u" after %i retries, exiting.",
185
logger.critical("No suitable Zeroconf service name found"
186
" after %i retries, exiting.",
158
187
self.rename_count)
159
raise AvahiServiceError(u"Too many renames")
160
self.name = unicode(self.server.GetAlternativeServiceName(self.name))
161
logger.info(u"Changing Zeroconf service name to %r ...",
188
raise AvahiServiceError("Too many renames")
189
self.name = unicode(self.server
190
.GetAlternativeServiceName(self.name))
191
logger.info("Changing Zeroconf service name to %r ...",
162
192
self.name)
163
syslogger.setFormatter(logging.Formatter
164
(u'Mandos (%s) [%%(process)d]:'
165
u' %%(levelname)s: %%(message)s'
166
% self.name))
167
193
self.remove()
168
194
try:
169
195
self.add()
170
except dbus.exceptions.DBusException, error:
171
logger.critical(u"DBusException: %s", error)
196
except dbus.exceptions.DBusException as error:
197
logger.critical("DBusException: %s", error)
172
198
self.cleanup()
173
199
os._exit(1)
174
200
self.rename_count += 1
175
201
def remove(self):
176
202
"""Derived from the Avahi example code"""
203
if self.entry_group_state_changed_match is not None:
204
self.entry_group_state_changed_match.remove()
205
self.entry_group_state_changed_match = None
177
206
if self.group is not None:
178
207
self.group.Reset()
179
208
def add(self):
180
209
"""Derived from the Avahi example code"""
210
self.remove()
181
211
if self.group is None:
182
212
self.group = dbus.Interface(
183
213
self.bus.get_object(avahi.DBUS_NAME,
184
214
self.server.EntryGroupNew()),
185
215
avahi.DBUS_INTERFACE_ENTRY_GROUP)
186
self.group.connect_to_signal('StateChanged',
187
self
188
.entry_group_state_changed)
189
logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
216
self.entry_group_state_changed_match = (
217
self.group.connect_to_signal(
218
'StateChanged', self.entry_group_state_changed))
219
logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
190
220
self.name, self.type)
191
221
self.group.AddService(
192
222
self.interface,
199
229
self.group.Commit()
200
230
def entry_group_state_changed(self, state, error):
201
231
"""Derived from the Avahi example code"""
202
logger.debug(u"Avahi entry group state change: %i", state)
232
logger.debug("Avahi entry group state change: %i", state)
203
233
204
234
if state == avahi.ENTRY_GROUP_ESTABLISHED:
205
logger.debug(u"Zeroconf service established.")
235
logger.debug("Zeroconf service established.")
206
236
elif state == avahi.ENTRY_GROUP_COLLISION:
207
logger.warning(u"Zeroconf service name collision.")
237
logger.info("Zeroconf service name collision.")
208
238
self.rename()
209
239
elif state == avahi.ENTRY_GROUP_FAILURE:
210
logger.critical(u"Avahi: Error in group state changed %s",
240
logger.critical("Avahi: Error in group state changed %s",
211
241
unicode(error))
212
raise AvahiGroupError(u"State changed: %s"
242
raise AvahiGroupError("State changed: %s"
213
243
% unicode(error))
214
244
def cleanup(self):
215
245
"""Derived from the Avahi example code"""
216
246
if self.group is not None:
217
self.group.Free()
247
try:
248
self.group.Free()
249
except (dbus.exceptions.UnknownMethodException,
250
dbus.exceptions.DBusException):
251
pass
218
252
self.group = None
219
def server_state_changed(self, state):
253
self.remove()
254
def server_state_changed(self, state, error=None):
220
255
"""Derived from the Avahi example code"""
221
logger.debug(u"Avahi server state change: %i", state)
222
if state == avahi.SERVER_COLLISION:
223
logger.error(u"Zeroconf server name collision")
224
self.remove()
256
logger.debug("Avahi server state change: %i", state)
257
bad_states = { avahi.SERVER_INVALID:
258
"Zeroconf server invalid",
259
avahi.SERVER_REGISTERING: None,
260
avahi.SERVER_COLLISION:
261
"Zeroconf server name collision",
262
avahi.SERVER_FAILURE:
263
"Zeroconf server failure" }
264
if state in bad_states:
265
if bad_states[state] is not None:
266
if error is None:
267
logger.error(bad_states[state])
268
else:
269
logger.error(bad_states[state] + ": %r", error)
270
self.cleanup()
225
271
elif state == avahi.SERVER_RUNNING:
226
272
self.add()
273
else:
274
if error is None:
275
logger.debug("Unknown state: %r", state)
276
else:
277
logger.debug("Unknown state: %r: %r", state, error)
227
278
def activate(self):
228
279
"""Derived from the Avahi example code"""
229
280
if self.server is None:
230
281
self.server = dbus.Interface(
231
282
self.bus.get_object(avahi.DBUS_NAME,
232
avahi.DBUS_PATH_SERVER),
283
avahi.DBUS_PATH_SERVER,
284
follow_name_owner_changes=True),
233
285
avahi.DBUS_INTERFACE_SERVER)
234
self.server.connect_to_signal(u"StateChanged",
286
self.server.connect_to_signal("StateChanged",
235
287
self.server_state_changed)
236
288
self.server_state_changed(self.server.GetState())
237
289
290
class AvahiServiceToSyslog(AvahiService):
291
def rename(self):
292
"""Add the new name to the syslog messages"""
293
ret = AvahiService.rename(self)
294
syslogger.setFormatter(logging.Formatter
295
('Mandos (%s) [%%(process)d]:'
296
' %%(levelname)s: %%(message)s'
297
% self.name))
298
return ret
238
299
300
def _timedelta_to_milliseconds(td):
301
"Convert a datetime.timedelta() to milliseconds"
302
return ((td.days * 24 * 60 * 60 * 1000)
303
+ (td.seconds * 1000)
304
+ (td.microseconds // 1000))
305
239
306
class Client(object):
240
307
"""A representation of a client host served by this server.
241
308
253
320
instance %(name)s can be used in the command.
254
321
checker_initiator_tag: a gobject event source tag, or None
255
322
created: datetime.datetime(); (UTC) object creation
323
client_structure: Object describing what attributes a client has
324
and is used for storing the client at exit
256
325
current_checker_command: string; current running checker_command
257
disable_hook: If set, called by disable() as disable_hook(self)
258
326
disable_initiator_tag: a gobject event source tag, or None
259
327
enabled: bool()
260
328
fingerprint: string (40 or 32 hexadecimal digits); used to
263
331
interval: datetime.timedelta(); How often to start a new checker
264
332
last_approval_request: datetime.datetime(); (UTC) or None
265
333
last_checked_ok: datetime.datetime(); (UTC) or None
334
last_checker_status: integer between 0 and 255 reflecting exit status
335
of last checker. -1 reflect crashed checker,
336
or None.
266
337
last_enabled: datetime.datetime(); (UTC)
267
338
name: string; from the config file, used in log messages and
268
339
D-Bus identifiers
269
340
secret: bytestring; sent verbatim (over TLS) to client
270
341
timeout: datetime.timedelta(); How long from last_checked_ok
271
342
until this client is disabled
343
extended_timeout: extra long timeout when password has been sent
272
344
runtime_expansions: Allowed attributes for runtime expansion.
345
expires: datetime.datetime(); time (UTC) when a client will be
346
disabled, or None
273
347
"""
274
348
275
runtime_expansions = (u"approval_delay", u"approval_duration",
276
u"created", u"enabled", u"fingerprint",
277
u"host", u"interval", u"last_checked_ok",
278
u"last_enabled", u"name", u"timeout")
279
280
@staticmethod
281
def _timedelta_to_milliseconds(td):
282
"Convert a datetime.timedelta() to milliseconds"
283
return ((td.days * 24 * 60 * 60 * 1000)
284
+ (td.seconds * 1000)
285
+ (td.microseconds // 1000))
349
runtime_expansions = ("approval_delay", "approval_duration",
350
"created", "enabled", "fingerprint",
351
"host", "interval", "last_checked_ok",
352
"last_enabled", "name", "timeout")
286
353
287
354
def timeout_milliseconds(self):
288
355
"Return the 'timeout' attribute in milliseconds"
289
return self._timedelta_to_milliseconds(self.timeout)
356
return _timedelta_to_milliseconds(self.timeout)
357
358
def extended_timeout_milliseconds(self):
359
"Return the 'extended_timeout' attribute in milliseconds"
360
return _timedelta_to_milliseconds(self.extended_timeout)
290
361
291
362
def interval_milliseconds(self):
292
363
"Return the 'interval' attribute in milliseconds"
293
return self._timedelta_to_milliseconds(self.interval)
294
364
return _timedelta_to_milliseconds(self.interval)
365
295
366
def approval_delay_milliseconds(self):
296
return self._timedelta_to_milliseconds(self.approval_delay)
367
return _timedelta_to_milliseconds(self.approval_delay)
297
368
298
def __init__(self, name = None, disable_hook=None, config=None):
369
def __init__(self, name = None, config=None):
299
370
"""Note: the 'checker' key in 'config' sets the
300
371
'checker_command' attribute and *not* the 'checker'
301
372
attribute."""
302
373
self.name = name
303
374
if config is None:
304
375
config = {}
305
logger.debug(u"Creating client %r", self.name)
376
logger.debug("Creating client %r", self.name)
306
377
# Uppercase and remove spaces from fingerprint for later
307
378
# comparison purposes with return value from the fingerprint()
308
379
# function
309
self.fingerprint = (config[u"fingerprint"].upper()
310
.replace(u" ", u""))
311
logger.debug(u" Fingerprint: %s", self.fingerprint)
312
if u"secret" in config:
313
self.secret = config[u"secret"].decode(u"base64")
314
elif u"secfile" in config:
380
self.fingerprint = (config["fingerprint"].upper()
381
.replace(" ", ""))
382
logger.debug(" Fingerprint: %s", self.fingerprint)
383
if "secret" in config:
384
self.secret = config["secret"].decode("base64")
385
elif "secfile" in config:
315
386
with open(os.path.expanduser(os.path.expandvars
316
(config[u"secfile"])),
387
(config["secfile"])),
317
388
"rb") as secfile:
318
389
self.secret = secfile.read()
319
390
else:
320
raise TypeError(u"No secret or secfile for client %s"
391
raise TypeError("No secret or secfile for client %s"
321
392
% self.name)
322
self.host = config.get(u"host", u"")
393
self.host = config.get("host", "")
323
394
self.created = datetime.datetime.utcnow()
324
self.enabled = False
395
self.enabled = True
325
396
self.last_approval_request = None
326
self.last_enabled = None
397
self.last_enabled = datetime.datetime.utcnow()
327
398
self.last_checked_ok = None
328
self.timeout = string_to_delta(config[u"timeout"])
329
self.interval = string_to_delta(config[u"interval"])
330
self.disable_hook = disable_hook
399
self.last_checker_status = None
400
self.timeout = string_to_delta(config["timeout"])
401
self.extended_timeout = string_to_delta(config
402
["extended_timeout"])
403
self.interval = string_to_delta(config["interval"])
331
404
self.checker = None
332
405
self.checker_initiator_tag = None
333
406
self.disable_initiator_tag = None
407
self.expires = datetime.datetime.utcnow() + self.timeout
334
408
self.checker_callback_tag = None
335
self.checker_command = config[u"checker"]
409
self.checker_command = config["checker"]
336
410
self.current_checker_command = None
337
self.last_connect = None
338
411
self._approved = None
339
self.approved_by_default = config.get(u"approved_by_default",
412
self.approved_by_default = config.get("approved_by_default",
340
413
True)
341
414
self.approvals_pending = 0
342
415
self.approval_delay = string_to_delta(
343
config[u"approval_delay"])
416
config["approval_delay"])
344
417
self.approval_duration = string_to_delta(
345
config[u"approval_duration"])
346
self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
418
config["approval_duration"])
419
self.changedstate = (multiprocessing_manager
420
.Condition(multiprocessing_manager
421
.Lock()))
422
self.client_structure = [attr for attr in self.__dict__.iterkeys() if not attr.startswith("_")]
423
self.client_structure.append("client_structure")
424
425
426
for name, t in inspect.getmembers(type(self),
427
lambda obj: isinstance(obj, property)):
428
if not name.startswith("_"):
429
self.client_structure.append(name)
347
430
431
# Send notice to process children that client state has changed
348
432
def send_changedstate(self):
349
self.changedstate.acquire()
350
self.changedstate.notify_all()
351
self.changedstate.release()
352
433
with self.changedstate:
434
self.changedstate.notify_all()
435
353
436
def enable(self):
354
437
"""Start this client's checker and timeout hooks"""
355
if getattr(self, u"enabled", False):
438
if getattr(self, "enabled", False):
356
439
# Already enabled
357
440
return
358
441
self.send_changedstate()
442
self.expires = datetime.datetime.utcnow() + self.timeout
443
self.enabled = True
359
444
self.last_enabled = datetime.datetime.utcnow()
360
# Schedule a new checker to be started an 'interval' from now,
361
# and every interval from then on.
362
self.checker_initiator_tag = (gobject.timeout_add
363
(self.interval_milliseconds(),
364
self.start_checker))
365
# Schedule a disable() when 'timeout' has passed
366
self.disable_initiator_tag = (gobject.timeout_add
367
(self.timeout_milliseconds(),
368
self.disable))
369
self.enabled = True
370
# Also start a new checker *right now*.
371
self.start_checker()
445
self.init_checker()
372
446
373
447
def disable(self, quiet=True):
374
448
"""Disable this client."""
377
451
if not quiet:
378
452
self.send_changedstate()
379
453
if not quiet:
380
logger.info(u"Disabling client %s", self.name)
381
if getattr(self, u"disable_initiator_tag", False):
454
logger.info("Disabling client %s", self.name)
455
if getattr(self, "disable_initiator_tag", False):
382
456
gobject.source_remove(self.disable_initiator_tag)
383
457
self.disable_initiator_tag = None
384
if getattr(self, u"checker_initiator_tag", False):
458
self.expires = None
459
if getattr(self, "checker_initiator_tag", False):
385
460
gobject.source_remove(self.checker_initiator_tag)
386
461
self.checker_initiator_tag = None
387
462
self.stop_checker()
388
if self.disable_hook:
389
self.disable_hook(self)
390
463
self.enabled = False
391
464
# Do not run this again if called by a gobject.timeout_add
392
465
return False
393
466
394
467
def __del__(self):
395
self.disable_hook = None
396
468
self.disable()
397
469
470
def init_checker(self):
471
# Schedule a new checker to be started an 'interval' from now,
472
# and every interval from then on.
473
self.checker_initiator_tag = (gobject.timeout_add
474
(self.interval_milliseconds(),
475
self.start_checker))
476
# Schedule a disable() when 'timeout' has passed
477
self.disable_initiator_tag = (gobject.timeout_add
478
(self.timeout_milliseconds(),
479
self.disable))
480
# Also start a new checker *right now*.
481
self.start_checker()
482
483
398
484
def checker_callback(self, pid, condition, command):
399
485
"""The checker has completed, so take appropriate actions."""
400
486
self.checker_callback_tag = None
401
487
self.checker = None
402
488
if os.WIFEXITED(condition):
403
exitstatus = os.WEXITSTATUS(condition)
404
if exitstatus == 0:
405
logger.info(u"Checker for %(name)s succeeded",
489
self.last_checker_status = os.WEXITSTATUS(condition)
490
if self.last_checker_status == 0:
491
logger.info("Checker for %(name)s succeeded",
406
492
vars(self))
407
493
self.checked_ok()
408
494
else:
409
logger.info(u"Checker for %(name)s failed",
495
logger.info("Checker for %(name)s failed",
410
496
vars(self))
411
497
else:
412
logger.warning(u"Checker for %(name)s crashed?",
498
self.last_checker_status = -1
499
logger.warning("Checker for %(name)s crashed?",
413
500
vars(self))
414
501
415
def checked_ok(self):
502
def checked_ok(self, timeout=None):
416
503
"""Bump up the timeout for this client.
417
504
418
505
This should only be called when the client has been seen,
419
506
alive and well.
420
507
"""
508
if timeout is None:
509
timeout = self.timeout
421
510
self.last_checked_ok = datetime.datetime.utcnow()
422
gobject.source_remove(self.disable_initiator_tag)
423
self.disable_initiator_tag = (gobject.timeout_add
424
(self.timeout_milliseconds(),
425
self.disable))
511
if self.disable_initiator_tag is not None:
512
gobject.source_remove(self.disable_initiator_tag)
513
if getattr(self, "enabled", False):
514
self.disable_initiator_tag = (gobject.timeout_add
515
(_timedelta_to_milliseconds
516
(timeout), self.disable))
517
self.expires = datetime.datetime.utcnow() + timeout
426
518
427
519
def need_approval(self):
428
520
self.last_approval_request = datetime.datetime.utcnow()
444
536
# If a checker exists, make sure it is not a zombie
445
537
try:
446
538
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
447
except (AttributeError, OSError), error:
539
except (AttributeError, OSError) as error:
448
540
if (isinstance(error, OSError)
449
541
and error.errno != errno.ECHILD):
450
542
raise error
451
543
else:
452
544
if pid:
453
logger.warning(u"Checker was a zombie")
545
logger.warning("Checker was a zombie")
454
546
gobject.source_remove(self.checker_callback_tag)
455
547
self.checker_callback(pid, status,
456
548
self.current_checker_command)
463
555
# Escape attributes for the shell
464
556
escaped_attrs = dict(
465
557
(attr,
466
re.escape(unicode(str(getattr(self, attr, u"")),
558
re.escape(unicode(str(getattr(self, attr, "")),
467
559
errors=
468
u'replace')))
560
'replace')))
469
561
for attr in
470
562
self.runtime_expansions)
471
563
472
564
try:
473
565
command = self.checker_command % escaped_attrs
474
except TypeError, error:
475
logger.error(u'Could not format string "%s":'
476
u' %s', self.checker_command, error)
566
except TypeError as error:
567
logger.error('Could not format string "%s":'
568
' %s', self.checker_command, error)
477
569
return True # Try again later
478
570
self.current_checker_command = command
479
571
try:
480
logger.info(u"Starting checker %r for %s",
572
logger.info("Starting checker %r for %s",
481
573
command, self.name)
482
574
# We don't need to redirect stdout and stderr, since
483
575
# in normal mode, that is already done by daemon(),
485
577
# always replaced by /dev/null.)
486
578
self.checker = subprocess.Popen(command,
487
579
close_fds=True,
488
shell=True, cwd=u"/")
580
shell=True, cwd="/")
489
581
self.checker_callback_tag = (gobject.child_watch_add
490
582
(self.checker.pid,
491
583
self.checker_callback,
496
588
if pid:
497
589
gobject.source_remove(self.checker_callback_tag)
498
590
self.checker_callback(pid, status, command)
499
except OSError, error:
500
logger.error(u"Failed to start subprocess: %s",
591
except OSError as error:
592
logger.error("Failed to start subprocess: %s",
501
593
error)
502
594
# Re-run this periodically if run by gobject.timeout_add
503
595
return True
507
599
if self.checker_callback_tag:
508
600
gobject.source_remove(self.checker_callback_tag)
509
601
self.checker_callback_tag = None
510
if getattr(self, u"checker", None) is None:
602
if getattr(self, "checker", None) is None:
511
603
return
512
logger.debug(u"Stopping checker for %(name)s", vars(self))
604
logger.debug("Stopping checker for %(name)s", vars(self))
513
605
try:
514
606
os.kill(self.checker.pid, signal.SIGTERM)
515
607
#time.sleep(0.5)
516
608
#if self.checker.poll() is None:
517
609
# os.kill(self.checker.pid, signal.SIGKILL)
518
except OSError, error:
610
except OSError as error:
519
611
if error.errno != errno.ESRCH: # No such process
520
612
raise
521
613
self.checker = None
522
614
523
def dbus_service_property(dbus_interface, signature=u"v",
524
access=u"readwrite", byte_arrays=False):
615
# Encrypts a client secret and stores it in a varible encrypted_secret
616
def encrypt_secret(self, key):
617
# Encryption-key need to be of a specific size, so we hash inputed key
618
hasheng = hashlib.sha256()
619
hasheng.update(key)
620
encryptionkey = hasheng.digest()
621
622
# Create validation hash so we know at decryption if it was sucessful
623
hasheng = hashlib.sha256()
624
hasheng.update(self.secret)
625
validationhash = hasheng.digest()
626
627
# Encrypt secret
628
iv = os.urandom(Crypto.Cipher.AES.block_size)
629
ciphereng = Crypto.Cipher.AES.new(encryptionkey,
630
Crypto.Cipher.AES.MODE_CFB, iv)
631
ciphertext = ciphereng.encrypt(validationhash+self.secret)
632
self.encrypted_secret = (ciphertext, iv)
633
634
# Decrypt a encrypted client secret
635
def decrypt_secret(self, key):
636
# Decryption-key need to be of a specific size, so we hash inputed key
637
hasheng = hashlib.sha256()
638
hasheng.update(key)
639
encryptionkey = hasheng.digest()
640
641
# Decrypt encrypted secret
642
ciphertext, iv = self.encrypted_secret
643
ciphereng = Crypto.Cipher.AES.new(encryptionkey,
644
Crypto.Cipher.AES.MODE_CFB, iv)
645
plain = ciphereng.decrypt(ciphertext)
646
647
# Validate decrypted secret to know if it was succesful
648
hasheng = hashlib.sha256()
649
validationhash = plain[:hasheng.digest_size]
650
secret = plain[hasheng.digest_size:]
651
hasheng.update(secret)
652
653
# if validation fails, we use key as new secret. Otherwhise, we use
654
# the decrypted secret
655
if hasheng.digest() == validationhash:
656
self.secret = secret
657
else:
658
self.secret = key
659
del self.encrypted_secret
660
661
662
def dbus_service_property(dbus_interface, signature="v",
663
access="readwrite", byte_arrays=False):
525
664
"""Decorators for marking methods of a DBusObjectWithProperties to
526
665
become properties on the D-Bus.
527
666
534
673
"""
535
674
# Encoding deeply encoded byte arrays is not supported yet by the
536
675
# "Set" method, so we fail early here:
537
if byte_arrays and signature != u"ay":
538
raise ValueError(u"Byte arrays not supported for non-'ay'"
539
u" signature %r" % signature)
676
if byte_arrays and signature != "ay":
677
raise ValueError("Byte arrays not supported for non-'ay'"
678
" signature %r" % signature)
540
679
def decorator(func):
541
680
func._dbus_is_property = True
542
681
func._dbus_interface = dbus_interface
543
682
func._dbus_signature = signature
544
683
func._dbus_access = access
545
684
func._dbus_name = func.__name__
546
if func._dbus_name.endswith(u"_dbus_property"):
685
if func._dbus_name.endswith("_dbus_property"):
547
686
func._dbus_name = func._dbus_name[:-14]
548
func._dbus_get_args_options = {u'byte_arrays': byte_arrays }
687
func._dbus_get_args_options = {'byte_arrays': byte_arrays }
549
688
return func
550
689
return decorator
551
690
571
710
572
711
class DBusObjectWithProperties(dbus.service.Object):
573
712
"""A D-Bus object with properties.
574
713
575
714
Classes inheriting from this can use the dbus_service_property
576
715
decorator to expose methods as D-Bus properties. It exposes the
577
716
standard Get(), Set(), and GetAll() methods on the D-Bus.
579
718
580
719
@staticmethod
581
720
def _is_dbus_property(obj):
582
return getattr(obj, u"_dbus_is_property", False)
721
return getattr(obj, "_dbus_is_property", False)
583
722
584
723
def _get_all_dbus_properties(self):
585
724
"""Returns a generator of (name, attribute) pairs
586
725
"""
587
return ((prop._dbus_name, prop)
726
return ((prop.__get__(self)._dbus_name, prop.__get__(self))
727
for cls in self.__class__.__mro__
588
728
for name, prop in
589
inspect.getmembers(self, self._is_dbus_property))
729
inspect.getmembers(cls, self._is_dbus_property))
590
730
591
731
def _get_dbus_property(self, interface_name, property_name):
592
732
"""Returns a bound method if one exists which is a D-Bus
593
733
property with the specified name and interface.
594
734
"""
595
for name in (property_name,
596
property_name + u"_dbus_property"):
597
prop = getattr(self, name, None)
598
if (prop is None
599
or not self._is_dbus_property(prop)
600
or prop._dbus_name != property_name
601
or (interface_name and prop._dbus_interface
602
and interface_name != prop._dbus_interface)):
603
continue
604
return prop
735
for cls in self.__class__.__mro__:
736
for name, value in (inspect.getmembers
737
(cls, self._is_dbus_property)):
738
if (value._dbus_name == property_name
739
and value._dbus_interface == interface_name):
740
return value.__get__(self)
741
605
742
# No such property
606
raise DBusPropertyNotFound(self.dbus_object_path + u":"
607
+ interface_name + u"."
743
raise DBusPropertyNotFound(self.dbus_object_path + ":"
744
+ interface_name + "."
608
745
+ property_name)
609
746
610
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ss",
611
out_signature=u"v")
747
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
748
out_signature="v")
612
749
def Get(self, interface_name, property_name):
613
750
"""Standard D-Bus property Get() method, see D-Bus standard.
614
751
"""
615
752
prop = self._get_dbus_property(interface_name, property_name)
616
if prop._dbus_access == u"write":
753
if prop._dbus_access == "write":
617
754
raise DBusPropertyAccessException(property_name)
618
755
value = prop()
619
if not hasattr(value, u"variant_level"):
756
if not hasattr(value, "variant_level"):
620
757
return value
621
758
return type(value)(value, variant_level=value.variant_level+1)
622
759
623
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ssv")
760
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
624
761
def Set(self, interface_name, property_name, value):
625
762
"""Standard D-Bus property Set() method, see D-Bus standard.
626
763
"""
627
764
prop = self._get_dbus_property(interface_name, property_name)
628
if prop._dbus_access == u"read":
765
if prop._dbus_access == "read":
629
766
raise DBusPropertyAccessException(property_name)
630
if prop._dbus_get_args_options[u"byte_arrays"]:
767
if prop._dbus_get_args_options["byte_arrays"]:
631
768
# The byte_arrays option is not supported yet on
632
769
# signatures other than "ay".
633
if prop._dbus_signature != u"ay":
770
if prop._dbus_signature != "ay":
634
771
raise ValueError
635
772
value = dbus.ByteArray(''.join(unichr(byte)
636
773
for byte in value))
637
774
prop(value)
638
775
639
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"s",
640
out_signature=u"a{sv}")
776
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
777
out_signature="a{sv}")
641
778
def GetAll(self, interface_name):
642
779
"""Standard D-Bus property GetAll() method, see D-Bus
643
780
standard.
644
781
645
782
Note: Will not include properties with access="write".
646
783
"""
647
all = {}
784
properties = {}
648
785
for name, prop in self._get_all_dbus_properties():
649
786
if (interface_name
650
787
and interface_name != prop._dbus_interface):
651
788
# Interface non-empty but did not match
652
789
continue
653
790
# Ignore write-only properties
654
if prop._dbus_access == u"write":
791
if prop._dbus_access == "write":
655
792
continue
656
793
value = prop()
657
if not hasattr(value, u"variant_level"):
658
all[name] = value
794
if not hasattr(value, "variant_level"):
795
properties[name] = value
659
796
continue
660
all[name] = type(value)(value, variant_level=
661
value.variant_level+1)
662
return dbus.Dictionary(all, signature=u"sv")
797
properties[name] = type(value)(value, variant_level=
798
value.variant_level+1)
799
return dbus.Dictionary(properties, signature="sv")
663
800
664
801
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
665
out_signature=u"s",
802
out_signature="s",
666
803
path_keyword='object_path',
667
804
connection_keyword='connection')
668
805
def Introspect(self, object_path, connection):
673
810
try:
674
811
document = xml.dom.minidom.parseString(xmlstring)
675
812
def make_tag(document, name, prop):
676
e = document.createElement(u"property")
677
e.setAttribute(u"name", name)
678
e.setAttribute(u"type", prop._dbus_signature)
679
e.setAttribute(u"access", prop._dbus_access)
813
e = document.createElement("property")
814
e.setAttribute("name", name)
815
e.setAttribute("type", prop._dbus_signature)
816
e.setAttribute("access", prop._dbus_access)
680
817
return e
681
for if_tag in document.getElementsByTagName(u"interface"):
818
for if_tag in document.getElementsByTagName("interface"):
682
819
for tag in (make_tag(document, name, prop)
683
820
for name, prop
684
821
in self._get_all_dbus_properties()
685
822
if prop._dbus_interface
686
== if_tag.getAttribute(u"name")):
823
== if_tag.getAttribute("name")):
687
824
if_tag.appendChild(tag)
688
825
# Add the names to the return values for the
689
826
# "org.freedesktop.DBus.Properties" methods
690
if (if_tag.getAttribute(u"name")
691
== u"org.freedesktop.DBus.Properties"):
692
for cn in if_tag.getElementsByTagName(u"method"):
693
if cn.getAttribute(u"name") == u"Get":
694
for arg in cn.getElementsByTagName(u"arg"):
695
if (arg.getAttribute(u"direction")
696
== u"out"):
697
arg.setAttribute(u"name", u"value")
698
elif cn.getAttribute(u"name") == u"GetAll":
699
for arg in cn.getElementsByTagName(u"arg"):
700
if (arg.getAttribute(u"direction")
701
== u"out"):
702
arg.setAttribute(u"name", u"props")
703
xmlstring = document.toxml(u"utf-8")
827
if (if_tag.getAttribute("name")
828
== "org.freedesktop.DBus.Properties"):
829
for cn in if_tag.getElementsByTagName("method"):
830
if cn.getAttribute("name") == "Get":
831
for arg in cn.getElementsByTagName("arg"):
832
if (arg.getAttribute("direction")
833
== "out"):
834
arg.setAttribute("name", "value")
835
elif cn.getAttribute("name") == "GetAll":
836
for arg in cn.getElementsByTagName("arg"):
837
if (arg.getAttribute("direction")
838
== "out"):
839
arg.setAttribute("name", "props")
840
xmlstring = document.toxml("utf-8")
704
841
document.unlink()
705
842
except (AttributeError, xml.dom.DOMException,
706
xml.parsers.expat.ExpatError), error:
707
logger.error(u"Failed to override Introspection method",
843
xml.parsers.expat.ExpatError) as error:
844
logger.error("Failed to override Introspection method",
708
845
error)
709
846
return xmlstring
710
847
711
848
849
def datetime_to_dbus (dt, variant_level=0):
850
"""Convert a UTC datetime.datetime() to a D-Bus type."""
851
if dt is None:
852
return dbus.String("", variant_level = variant_level)
853
return dbus.String(dt.isoformat(),
854
variant_level=variant_level)
855
856
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
857
.__metaclass__):
858
"""Applied to an empty subclass of a D-Bus object, this metaclass
859
will add additional D-Bus attributes matching a certain pattern.
860
"""
861
def __new__(mcs, name, bases, attr):
862
# Go through all the base classes which could have D-Bus
863
# methods, signals, or properties in them
864
for base in (b for b in bases
865
if issubclass(b, dbus.service.Object)):
866
# Go though all attributes of the base class
867
for attrname, attribute in inspect.getmembers(base):
868
# Ignore non-D-Bus attributes, and D-Bus attributes
869
# with the wrong interface name
870
if (not hasattr(attribute, "_dbus_interface")
871
or not attribute._dbus_interface
872
.startswith("se.recompile.Mandos")):
873
continue
874
# Create an alternate D-Bus interface name based on
875
# the current name
876
alt_interface = (attribute._dbus_interface
877
.replace("se.recompile.Mandos",
878
"se.bsnet.fukt.Mandos"))
879
# Is this a D-Bus signal?
880
if getattr(attribute, "_dbus_is_signal", False):
881
# Extract the original non-method function by
882
# black magic
883
nonmethod_func = (dict(
884
zip(attribute.func_code.co_freevars,
885
attribute.__closure__))["func"]
886
.cell_contents)
887
# Create a new, but exactly alike, function
888
# object, and decorate it to be a new D-Bus signal
889
# with the alternate D-Bus interface name
890
new_function = (dbus.service.signal
891
(alt_interface,
892
attribute._dbus_signature)
893
(types.FunctionType(
894
nonmethod_func.func_code,
895
nonmethod_func.func_globals,
896
nonmethod_func.func_name,
897
nonmethod_func.func_defaults,
898
nonmethod_func.func_closure)))
899
# Define a creator of a function to call both the
900
# old and new functions, so both the old and new
901
# signals gets sent when the function is called
902
def fixscope(func1, func2):
903
"""This function is a scope container to pass
904
func1 and func2 to the "call_both" function
905
outside of its arguments"""
906
def call_both(*args, **kwargs):
907
"""This function will emit two D-Bus
908
signals by calling func1 and func2"""
909
func1(*args, **kwargs)
910
func2(*args, **kwargs)
911
return call_both
912
# Create the "call_both" function and add it to
913
# the class
914
attr[attrname] = fixscope(attribute,
915
new_function)
916
# Is this a D-Bus method?
917
elif getattr(attribute, "_dbus_is_method", False):
918
# Create a new, but exactly alike, function
919
# object. Decorate it to be a new D-Bus method
920
# with the alternate D-Bus interface name. Add it
921
# to the class.
922
attr[attrname] = (dbus.service.method
923
(alt_interface,
924
attribute._dbus_in_signature,
925
attribute._dbus_out_signature)
926
(types.FunctionType
927
(attribute.func_code,
928
attribute.func_globals,
929
attribute.func_name,
930
attribute.func_defaults,
931
attribute.func_closure)))
932
# Is this a D-Bus property?
933
elif getattr(attribute, "_dbus_is_property", False):
934
# Create a new, but exactly alike, function
935
# object, and decorate it to be a new D-Bus
936
# property with the alternate D-Bus interface
937
# name. Add it to the class.
938
attr[attrname] = (dbus_service_property
939
(alt_interface,
940
attribute._dbus_signature,
941
attribute._dbus_access,
942
attribute
943
._dbus_get_args_options
944
["byte_arrays"])
945
(types.FunctionType
946
(attribute.func_code,
947
attribute.func_globals,
948
attribute.func_name,
949
attribute.func_defaults,
950
attribute.func_closure)))
951
return type.__new__(mcs, name, bases, attr)
952
712
953
class ClientDBus(Client, DBusObjectWithProperties):
713
954
"""A Client class using D-Bus
714
955
718
959
"""
719
960
720
961
runtime_expansions = (Client.runtime_expansions
721
+ (u"dbus_object_path",))
962
+ ("dbus_object_path",))
722
963
723
964
# dbus.service.Object doesn't use super(), so we can't either.
724
965
725
966
def __init__(self, bus = None, *args, **kwargs):
967
self.bus = bus
968
Client.__init__(self, *args, **kwargs)
969
726
970
self._approvals_pending = 0
727
self.bus = bus
728
Client.__init__(self, *args, **kwargs)
729
971
# Only now, when this client is initialized, can it show up on
730
972
# the D-Bus
731
973
client_object_name = unicode(self.name).translate(
732
{ord(u"."): ord(u"_"),
733
ord(u"-"): ord(u"_")})
974
{ord("."): ord("_"),
975
ord("-"): ord("_")})
734
976
self.dbus_object_path = (dbus.ObjectPath
735
(u"/clients/" + client_object_name))
977
("/clients/" + client_object_name))
736
978
DBusObjectWithProperties.__init__(self, self.bus,
737
979
self.dbus_object_path)
738
980
739
def _get_approvals_pending(self):
740
return self._approvals_pending
741
def _set_approvals_pending(self, value):
742
old_value = self._approvals_pending
743
self._approvals_pending = value
744
bval = bool(value)
745
if (hasattr(self, "dbus_object_path")
746
and bval is not bool(old_value)):
747
dbus_bool = dbus.Boolean(bval, variant_level=1)
748
self.PropertyChanged(dbus.String(u"ApprovalPending"),
749
dbus_bool)
981
def notifychangeproperty(transform_func,
982
dbus_name, type_func=lambda x: x,
983
variant_level=1):
984
""" Modify a variable so that it's a property which announces
985
its changes to DBus.
750
986
751
approvals_pending = property(_get_approvals_pending,
752
_set_approvals_pending)
753
del _get_approvals_pending, _set_approvals_pending
754
755
@staticmethod
756
def _datetime_to_dbus(dt, variant_level=0):
757
"""Convert a UTC datetime.datetime() to a D-Bus type."""
758
return dbus.String(dt.isoformat(),
759
variant_level=variant_level)
760
761
def enable(self):
762
oldstate = getattr(self, u"enabled", False)
763
r = Client.enable(self)
764
if oldstate != self.enabled:
765
# Emit D-Bus signals
766
self.PropertyChanged(dbus.String(u"Enabled"),
767
dbus.Boolean(True, variant_level=1))
768
self.PropertyChanged(
769
dbus.String(u"LastEnabled"),
770
self._datetime_to_dbus(self.last_enabled,
771
variant_level=1))
772
return r
773
774
def disable(self, quiet = False):
775
oldstate = getattr(self, u"enabled", False)
776
r = Client.disable(self, quiet=quiet)
777
if not quiet and oldstate != self.enabled:
778
# Emit D-Bus signal
779
self.PropertyChanged(dbus.String(u"Enabled"),
780
dbus.Boolean(False, variant_level=1))
781
return r
987
transform_fun: Function that takes a value and a variant_level
988
and transforms it to a D-Bus type.
989
dbus_name: D-Bus name of the variable
990
type_func: Function that transform the value before sending it
991
to the D-Bus. Default: no transform
992
variant_level: D-Bus variant level. Default: 1
993
"""
994
attrname = "_{0}".format(dbus_name)
995
def setter(self, value):
996
if hasattr(self, "dbus_object_path"):
997
if (not hasattr(self, attrname) or
998
type_func(getattr(self, attrname, None))
999
!= type_func(value)):
1000
dbus_value = transform_func(type_func(value),
1001
variant_level
1002
=variant_level)
1003
self.PropertyChanged(dbus.String(dbus_name),
1004
dbus_value)
1005
setattr(self, attrname, value)
1006
1007
return property(lambda self: getattr(self, attrname), setter)
1008
1009
1010
expires = notifychangeproperty(datetime_to_dbus, "Expires")
1011
approvals_pending = notifychangeproperty(dbus.Boolean,
1012
"ApprovalPending",
1013
type_func = bool)
1014
enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1015
last_enabled = notifychangeproperty(datetime_to_dbus,
1016
"LastEnabled")
1017
checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
1018
type_func = lambda checker:
1019
checker is not None)
1020
last_checked_ok = notifychangeproperty(datetime_to_dbus,
1021
"LastCheckedOK")
1022
last_approval_request = notifychangeproperty(
1023
datetime_to_dbus, "LastApprovalRequest")
1024
approved_by_default = notifychangeproperty(dbus.Boolean,
1025
"ApprovedByDefault")
1026
approval_delay = notifychangeproperty(dbus.UInt16,
1027
"ApprovalDelay",
1028
type_func =
1029
_timedelta_to_milliseconds)
1030
approval_duration = notifychangeproperty(
1031
dbus.UInt16, "ApprovalDuration",
1032
type_func = _timedelta_to_milliseconds)
1033
host = notifychangeproperty(dbus.String, "Host")
1034
timeout = notifychangeproperty(dbus.UInt16, "Timeout",
1035
type_func =
1036
_timedelta_to_milliseconds)
1037
extended_timeout = notifychangeproperty(
1038
dbus.UInt16, "ExtendedTimeout",
1039
type_func = _timedelta_to_milliseconds)
1040
interval = notifychangeproperty(dbus.UInt16,
1041
"Interval",
1042
type_func =
1043
_timedelta_to_milliseconds)
1044
checker_command = notifychangeproperty(dbus.String, "Checker")
1045
1046
del notifychangeproperty
782
1047
783
1048
def __del__(self, *args, **kwargs):
784
1049
try:
785
1050
self.remove_from_connection()
786
1051
except LookupError:
787
1052
pass
788
if hasattr(DBusObjectWithProperties, u"__del__"):
1053
if hasattr(DBusObjectWithProperties, "__del__"):
789
1054
DBusObjectWithProperties.__del__(self, *args, **kwargs)
790
1055
Client.__del__(self, *args, **kwargs)
791
1056
793
1058
*args, **kwargs):
794
1059
self.checker_callback_tag = None
795
1060
self.checker = None
796
# Emit D-Bus signal
797
self.PropertyChanged(dbus.String(u"CheckerRunning"),
798
dbus.Boolean(False, variant_level=1))
799
1061
if os.WIFEXITED(condition):
800
1062
exitstatus = os.WEXITSTATUS(condition)
801
1063
# Emit D-Bus signal
811
1073
return Client.checker_callback(self, pid, condition, command,
812
1074
*args, **kwargs)
813
1075
814
def checked_ok(self, *args, **kwargs):
815
r = Client.checked_ok(self, *args, **kwargs)
816
# Emit D-Bus signal
817
self.PropertyChanged(
818
dbus.String(u"LastCheckedOK"),
819
(self._datetime_to_dbus(self.last_checked_ok,
820
variant_level=1)))
821
return r
822
823
def need_approval(self, *args, **kwargs):
824
r = Client.need_approval(self, *args, **kwargs)
825
# Emit D-Bus signal
826
self.PropertyChanged(
827
dbus.String(u"LastApprovalRequest"),
828
(self._datetime_to_dbus(self.last_approval_request,
829
variant_level=1)))
830
return r
831
832
1076
def start_checker(self, *args, **kwargs):
833
1077
old_checker = self.checker
834
1078
if self.checker is not None:
841
1085
and old_checker_pid != self.checker.pid):
842
1086
# Emit D-Bus signal
843
1087
self.CheckerStarted(self.current_checker_command)
844
self.PropertyChanged(
845
dbus.String(u"CheckerRunning"),
846
dbus.Boolean(True, variant_level=1))
847
1088
return r
848
1089
849
def stop_checker(self, *args, **kwargs):
850
old_checker = getattr(self, u"checker", None)
851
r = Client.stop_checker(self, *args, **kwargs)
852
if (old_checker is not None
853
and getattr(self, u"checker", None) is None):
854
self.PropertyChanged(dbus.String(u"CheckerRunning"),
855
dbus.Boolean(False, variant_level=1))
856
return r
857
858
1090
def _reset_approved(self):
859
1091
self._approved = None
860
1092
return False
862
1094
def approve(self, value=True):
863
1095
self.send_changedstate()
864
1096
self._approved = value
865
gobject.timeout_add(self._timedelta_to_milliseconds
1097
gobject.timeout_add(_timedelta_to_milliseconds
866
1098
(self.approval_duration),
867
1099
self._reset_approved)
868
1100
869
1101
870
1102
## D-Bus methods, signals & properties
871
_interface = u"se.bsnet.fukt.Mandos.Client"
1103
_interface = "se.recompile.Mandos.Client"
872
1104
873
1105
## Signals
874
1106
875
1107
# CheckerCompleted - signal
876
@dbus.service.signal(_interface, signature=u"nxs")
1108
@dbus.service.signal(_interface, signature="nxs")
877
1109
def CheckerCompleted(self, exitcode, waitstatus, command):
878
1110
"D-Bus signal"
879
1111
pass
880
1112
881
1113
# CheckerStarted - signal
882
@dbus.service.signal(_interface, signature=u"s")
1114
@dbus.service.signal(_interface, signature="s")
883
1115
def CheckerStarted(self, command):
884
1116
"D-Bus signal"
885
1117
pass
886
1118
887
1119
# PropertyChanged - signal
888
@dbus.service.signal(_interface, signature=u"sv")
1120
@dbus.service.signal(_interface, signature="sv")
889
1121
def PropertyChanged(self, property, value):
890
1122
"D-Bus signal"
891
1123
pass
900
1132
pass
901
1133
902
1134
# Rejected - signal
903
@dbus.service.signal(_interface, signature=u"s")
1135
@dbus.service.signal(_interface, signature="s")
904
1136
def Rejected(self, reason):
905
1137
"D-Bus signal"
906
1138
pass
907
1139
908
1140
# NeedApproval - signal
909
@dbus.service.signal(_interface, signature=u"tb")
1141
@dbus.service.signal(_interface, signature="tb")
910
1142
def NeedApproval(self, timeout, default):
911
1143
"D-Bus signal"
912
1144
return self.need_approval()
913
1145
1146
# NeRwequest - signal
1147
@dbus.service.signal(_interface, signature="s")
1148
def NewRequest(self, ip):
1149
"""D-Bus signal
1150
Is sent after a client request a password.
1151
"""
1152
pass
1153
914
1154
## Methods
915
1155
916
1156
# Approve - method
917
@dbus.service.method(_interface, in_signature=u"b")
1157
@dbus.service.method(_interface, in_signature="b")
918
1158
def Approve(self, value):
919
1159
self.approve(value)
920
1160
921
1161
# CheckedOK - method
922
1162
@dbus.service.method(_interface)
923
1163
def CheckedOK(self):
924
return self.checked_ok()
1164
self.checked_ok()
925
1165
926
1166
# Enable - method
927
1167
@dbus.service.method(_interface)
949
1189
## Properties
950
1190
951
1191
# ApprovalPending - property
952
@dbus_service_property(_interface, signature=u"b", access=u"read")
1192
@dbus_service_property(_interface, signature="b", access="read")
953
1193
def ApprovalPending_dbus_property(self):
954
1194
return dbus.Boolean(bool(self.approvals_pending))
955
1195
956
1196
# ApprovedByDefault - property
957
@dbus_service_property(_interface, signature=u"b",
958
access=u"readwrite")
1197
@dbus_service_property(_interface, signature="b",
1198
access="readwrite")
959
1199
def ApprovedByDefault_dbus_property(self, value=None):
960
1200
if value is None: # get
961
1201
return dbus.Boolean(self.approved_by_default)
962
1202
self.approved_by_default = bool(value)
963
# Emit D-Bus signal
964
self.PropertyChanged(dbus.String(u"ApprovedByDefault"),
965
dbus.Boolean(value, variant_level=1))
966
1203
967
1204
# ApprovalDelay - property
968
@dbus_service_property(_interface, signature=u"t",
969
access=u"readwrite")
1205
@dbus_service_property(_interface, signature="t",
1206
access="readwrite")
970
1207
def ApprovalDelay_dbus_property(self, value=None):
971
1208
if value is None: # get
972
1209
return dbus.UInt64(self.approval_delay_milliseconds())
973
1210
self.approval_delay = datetime.timedelta(0, 0, 0, value)
974
# Emit D-Bus signal
975
self.PropertyChanged(dbus.String(u"ApprovalDelay"),
976
dbus.UInt64(value, variant_level=1))
977
1211
978
1212
# ApprovalDuration - property
979
@dbus_service_property(_interface, signature=u"t",
980
access=u"readwrite")
1213
@dbus_service_property(_interface, signature="t",
1214
access="readwrite")
981
1215
def ApprovalDuration_dbus_property(self, value=None):
982
1216
if value is None: # get
983
return dbus.UInt64(self._timedelta_to_milliseconds(
1217
return dbus.UInt64(_timedelta_to_milliseconds(
984
1218
self.approval_duration))
985
1219
self.approval_duration = datetime.timedelta(0, 0, 0, value)
986
# Emit D-Bus signal
987
self.PropertyChanged(dbus.String(u"ApprovalDuration"),
988
dbus.UInt64(value, variant_level=1))
989
1220
990
1221
# Name - property
991
@dbus_service_property(_interface, signature=u"s", access=u"read")
1222
@dbus_service_property(_interface, signature="s", access="read")
992
1223
def Name_dbus_property(self):
993
1224
return dbus.String(self.name)
994
1225
995
1226
# Fingerprint - property
996
@dbus_service_property(_interface, signature=u"s", access=u"read")
1227
@dbus_service_property(_interface, signature="s", access="read")
997
1228
def Fingerprint_dbus_property(self):
998
1229
return dbus.String(self.fingerprint)
999
1230
1000
1231
# Host - property
1001
@dbus_service_property(_interface, signature=u"s",
1002
access=u"readwrite")
1232
@dbus_service_property(_interface, signature="s",
1233
access="readwrite")
1003
1234
def Host_dbus_property(self, value=None):
1004
1235
if value is None: # get
1005
1236
return dbus.String(self.host)
1006
1237
self.host = value
1007
# Emit D-Bus signal
1008
self.PropertyChanged(dbus.String(u"Host"),
1009
dbus.String(value, variant_level=1))
1010
1238
1011
1239
# Created - property
1012
@dbus_service_property(_interface, signature=u"s", access=u"read")
1240
@dbus_service_property(_interface, signature="s", access="read")
1013
1241
def Created_dbus_property(self):
1014
return dbus.String(self._datetime_to_dbus(self.created))
1242
return dbus.String(datetime_to_dbus(self.created))
1015
1243
1016
1244
# LastEnabled - property
1017
@dbus_service_property(_interface, signature=u"s", access=u"read")
1245
@dbus_service_property(_interface, signature="s", access="read")
1018
1246
def LastEnabled_dbus_property(self):
1019
if self.last_enabled is None:
1020
return dbus.String(u"")
1021
return dbus.String(self._datetime_to_dbus(self.last_enabled))
1247
return datetime_to_dbus(self.last_enabled)
1022
1248
1023
1249
# Enabled - property
1024
@dbus_service_property(_interface, signature=u"b",
1025
access=u"readwrite")
1250
@dbus_service_property(_interface, signature="b",
1251
access="readwrite")
1026
1252
def Enabled_dbus_property(self, value=None):
1027
1253
if value is None: # get
1028
1254
return dbus.Boolean(self.enabled)
1032
1258
self.disable()
1033
1259
1034
1260
# LastCheckedOK - property
1035
@dbus_service_property(_interface, signature=u"s",
1036
access=u"readwrite")
1261
@dbus_service_property(_interface, signature="s",
1262
access="readwrite")
1037
1263
def LastCheckedOK_dbus_property(self, value=None):
1038
1264
if value is not None:
1039
1265
self.checked_ok()
1040
1266
return
1041
if self.last_checked_ok is None:
1042
return dbus.String(u"")
1043
return dbus.String(self._datetime_to_dbus(self
1044
.last_checked_ok))
1267
return datetime_to_dbus(self.last_checked_ok)
1268
1269
# Expires - property
1270
@dbus_service_property(_interface, signature="s", access="read")
1271
def Expires_dbus_property(self):
1272
return datetime_to_dbus(self.expires)
1045
1273
1046
1274
# LastApprovalRequest - property
1047
@dbus_service_property(_interface, signature=u"s", access=u"read")
1275
@dbus_service_property(_interface, signature="s", access="read")
1048
1276
def LastApprovalRequest_dbus_property(self):
1049
if self.last_approval_request is None:
1050
return dbus.String(u"")
1051
return dbus.String(self.
1052
_datetime_to_dbus(self
1053
.last_approval_request))
1277
return datetime_to_dbus(self.last_approval_request)
1054
1278
1055
1279
# Timeout - property
1056
@dbus_service_property(_interface, signature=u"t",
1057
access=u"readwrite")
1280
@dbus_service_property(_interface, signature="t",
1281
access="readwrite")
1058
1282
def Timeout_dbus_property(self, value=None):
1059
1283
if value is None: # get
1060
1284
return dbus.UInt64(self.timeout_milliseconds())
1061
1285
self.timeout = datetime.timedelta(0, 0, 0, value)
1062
# Emit D-Bus signal
1063
self.PropertyChanged(dbus.String(u"Timeout"),
1064
dbus.UInt64(value, variant_level=1))
1065
if getattr(self, u"disable_initiator_tag", None) is None:
1286
if getattr(self, "disable_initiator_tag", None) is None:
1066
1287
return
1067
1288
# Reschedule timeout
1068
1289
gobject.source_remove(self.disable_initiator_tag)
1069
1290
self.disable_initiator_tag = None
1070
time_to_die = (self.
1071
_timedelta_to_milliseconds((self
1072
.last_checked_ok
1073
+ self.timeout)
1074
- datetime.datetime
1075
.utcnow()))
1291
self.expires = None
1292
time_to_die = _timedelta_to_milliseconds((self
1293
.last_checked_ok
1294
+ self.timeout)
1295
- datetime.datetime
1296
.utcnow())
1076
1297
if time_to_die <= 0:
1077
1298
# The timeout has passed
1078
1299
self.disable()
1079
1300
else:
1301
self.expires = (datetime.datetime.utcnow()
1302
+ datetime.timedelta(milliseconds =
1303
time_to_die))
1080
1304
self.disable_initiator_tag = (gobject.timeout_add
1081
1305
(time_to_die, self.disable))
1082
1306
1307
# ExtendedTimeout - property
1308
@dbus_service_property(_interface, signature="t",
1309
access="readwrite")
1310
def ExtendedTimeout_dbus_property(self, value=None):
1311
if value is None: # get
1312
return dbus.UInt64(self.extended_timeout_milliseconds())
1313
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1314
1083
1315
# Interval - property
1084
@dbus_service_property(_interface, signature=u"t",
1085
access=u"readwrite")
1316
@dbus_service_property(_interface, signature="t",
1317
access="readwrite")
1086
1318
def Interval_dbus_property(self, value=None):
1087
1319
if value is None: # get
1088
1320
return dbus.UInt64(self.interval_milliseconds())
1089
1321
self.interval = datetime.timedelta(0, 0, 0, value)
1090
# Emit D-Bus signal
1091
self.PropertyChanged(dbus.String(u"Interval"),
1092
dbus.UInt64(value, variant_level=1))
1093
if getattr(self, u"checker_initiator_tag", None) is None:
1322
if getattr(self, "checker_initiator_tag", None) is None:
1094
1323
return
1095
1324
# Reschedule checker run
1096
1325
gobject.source_remove(self.checker_initiator_tag)
1097
1326
self.checker_initiator_tag = (gobject.timeout_add
1098
1327
(value, self.start_checker))
1099
1328
self.start_checker() # Start one now, too
1100
1329
1101
1330
# Checker - property
1102
@dbus_service_property(_interface, signature=u"s",
1103
access=u"readwrite")
1331
@dbus_service_property(_interface, signature="s",
1332
access="readwrite")
1104
1333
def Checker_dbus_property(self, value=None):
1105
1334
if value is None: # get
1106
1335
return dbus.String(self.checker_command)
1107
1336
self.checker_command = value
1108
# Emit D-Bus signal
1109
self.PropertyChanged(dbus.String(u"Checker"),
1110
dbus.String(self.checker_command,
1111
variant_level=1))
1112
1337
1113
1338
# CheckerRunning - property
1114
@dbus_service_property(_interface, signature=u"b",
1115
access=u"readwrite")
1339
@dbus_service_property(_interface, signature="b",
1340
access="readwrite")
1116
1341
def CheckerRunning_dbus_property(self, value=None):
1117
1342
if value is None: # get
1118
1343
return dbus.Boolean(self.checker is not None)
1122
1347
self.stop_checker()
1123
1348
1124
1349
# ObjectPath - property
1125
@dbus_service_property(_interface, signature=u"o", access=u"read")
1350
@dbus_service_property(_interface, signature="o", access="read")
1126
1351
def ObjectPath_dbus_property(self):
1127
1352
return self.dbus_object_path # is already a dbus.ObjectPath
1128
1353
1129
1354
# Secret = property
1130
@dbus_service_property(_interface, signature=u"ay",
1131
access=u"write", byte_arrays=True)
1355
@dbus_service_property(_interface, signature="ay",
1356
access="write", byte_arrays=True)
1132
1357
def Secret_dbus_property(self, value):
1133
1358
self.secret = str(value)
1134
1359
1141
1366
self._pipe.send(('init', fpr, address))
1142
1367
if not self._pipe.recv():
1143
1368
raise KeyError()
1144
1369
1145
1370
def __getattribute__(self, name):
1146
1371
if(name == '_pipe'):
1147
1372
return super(ProxyClient, self).__getattribute__(name)
1154
1379
self._pipe.send(('funcall', name, args, kwargs))
1155
1380
return self._pipe.recv()[1]
1156
1381
return func
1157
1382
1158
1383
def __setattr__(self, name, value):
1159
1384
if(name == '_pipe'):
1160
1385
return super(ProxyClient, self).__setattr__(name, value)
1161
1386
self._pipe.send(('setattr', name, value))
1162
1387
1388
class ClientDBusTransitional(ClientDBus):
1389
__metaclass__ = AlternateDBusNamesMetaclass
1163
1390
1164
1391
class ClientHandler(socketserver.BaseRequestHandler, object):
1165
1392
"""A class to handle client connections.
1169
1396
1170
1397
def handle(self):
1171
1398
with contextlib.closing(self.server.child_pipe) as child_pipe:
1172
logger.info(u"TCP connection from: %s",
1399
logger.info("TCP connection from: %s",
1173
1400
unicode(self.client_address))
1174
logger.debug(u"Pipe FD: %d",
1401
logger.debug("Pipe FD: %d",
1175
1402
self.server.child_pipe.fileno())
1176
1403
1177
1404
session = (gnutls.connection
1178
1405
.ClientSession(self.request,
1179
1406
gnutls.connection
1180
1407
.X509Credentials()))
1181
1408
1182
1409
# Note: gnutls.connection.X509Credentials is really a
1183
1410
# generic GnuTLS certificate credentials object so long as
1184
1411
# no X.509 keys are added to it. Therefore, we can use it
1185
1412
# here despite using OpenPGP certificates.
1186
1187
#priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
1188
# u"+AES-256-CBC", u"+SHA1",
1189
# u"+COMP-NULL", u"+CTYPE-OPENPGP",
1190
# u"+DHE-DSS"))
1413
1414
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1415
# "+AES-256-CBC", "+SHA1",
1416
# "+COMP-NULL", "+CTYPE-OPENPGP",
1417
# "+DHE-DSS"))
1191
1418
# Use a fallback default, since this MUST be set.
1192
1419
priority = self.server.gnutls_priority
1193
1420
if priority is None:
1194
priority = u"NORMAL"
1421
priority = "NORMAL"
1195
1422
(gnutls.library.functions
1196
1423
.gnutls_priority_set_direct(session._c_object,
1197
1424
priority, None))
1198
1425
1199
1426
# Start communication using the Mandos protocol
1200
1427
# Get protocol number
1201
1428
line = self.request.makefile().readline()
1202
logger.debug(u"Protocol version: %r", line)
1429
logger.debug("Protocol version: %r", line)
1203
1430
try:
1204
1431
if int(line.strip().split()[0]) > 1:
1205
1432
raise RuntimeError
1206
except (ValueError, IndexError, RuntimeError), error:
1207
logger.error(u"Unknown protocol version: %s", error)
1433
except (ValueError, IndexError, RuntimeError) as error:
1434
logger.error("Unknown protocol version: %s", error)
1208
1435
return
1209
1436
1210
1437
# Start GnuTLS connection
1211
1438
try:
1212
1439
session.handshake()
1213
except gnutls.errors.GNUTLSError, error:
1214
logger.warning(u"Handshake failed: %s", error)
1440
except gnutls.errors.GNUTLSError as error:
1441
logger.warning("Handshake failed: %s", error)
1215
1442
# Do not run session.bye() here: the session is not
1216
1443
# established. Just abandon the request.
1217
1444
return
1218
logger.debug(u"Handshake succeeded")
1219
1445
logger.debug("Handshake succeeded")
1446
1220
1447
approval_required = False
1221
1448
try:
1222
1449
try:
1223
1450
fpr = self.fingerprint(self.peer_certificate
1224
1451
(session))
1225
except (TypeError, gnutls.errors.GNUTLSError), error:
1226
logger.warning(u"Bad certificate: %s", error)
1452
except (TypeError,
1453
gnutls.errors.GNUTLSError) as error:
1454
logger.warning("Bad certificate: %s", error)
1227
1455
return
1228
logger.debug(u"Fingerprint: %s", fpr)
1229
1456
logger.debug("Fingerprint: %s", fpr)
1457
if self.server.use_dbus:
1458
# Emit D-Bus signal
1459
client.NewRequest(str(self.client_address))
1460
1230
1461
try:
1231
1462
client = ProxyClient(child_pipe, fpr,
1232
1463
self.client_address)
1240
1471
1241
1472
while True:
1242
1473
if not client.enabled:
1243
logger.warning(u"Client %s is disabled",
1474
logger.info("Client %s is disabled",
1244
1475
client.name)
1245
1476
if self.server.use_dbus:
1246
1477
# Emit D-Bus signal
1247
client.Rejected("Disabled")
1478
client.Rejected("Disabled")
1248
1479
return
1249
1480
1250
1481
if client._approved or not client.approval_delay:
1251
1482
#We are approved or approval is disabled
1252
1483
break
1253
1484
elif client._approved is None:
1254
logger.info(u"Client %s needs approval",
1485
logger.info("Client %s needs approval",
1255
1486
client.name)
1256
1487
if self.server.use_dbus:
1257
1488
# Emit D-Bus signal
1259
1490
client.approval_delay_milliseconds(),
1260
1491
client.approved_by_default)
1261
1492
else:
1262
logger.warning(u"Client %s was not approved",
1493
logger.warning("Client %s was not approved",
1263
1494
client.name)
1264
1495
if self.server.use_dbus:
1265
1496
# Emit D-Bus signal
1267
1498
return
1268
1499
1269
1500
#wait until timeout or approved
1270
#x = float(client._timedelta_to_milliseconds(delay))
1271
1501
time = datetime.datetime.now()
1272
1502
client.changedstate.acquire()
1273
client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
1503
(client.changedstate.wait
1504
(float(client._timedelta_to_milliseconds(delay)
1505
/ 1000)))
1274
1506
client.changedstate.release()
1275
1507
time2 = datetime.datetime.now()
1276
1508
if (time2 - time) >= delay:
1291
1523
while sent_size < len(client.secret):
1292
1524
try:
1293
1525
sent = session.send(client.secret[sent_size:])
1294
except (gnutls.errors.GNUTLSError), error:
1526
except gnutls.errors.GNUTLSError as error:
1295
1527
logger.warning("gnutls send failed")
1296
1528
return
1297
logger.debug(u"Sent: %d, remaining: %d",
1529
logger.debug("Sent: %d, remaining: %d",
1298
1530
sent, len(client.secret)
1299
1531
- (sent_size + sent))
1300
1532
sent_size += sent
1301
1302
logger.info(u"Sending secret to %s", client.name)
1303
# bump the timeout as if seen
1304
client.checked_ok()
1533
1534
logger.info("Sending secret to %s", client.name)
1535
# bump the timeout using extended_timeout
1536
client.checked_ok(client.extended_timeout)
1305
1537
if self.server.use_dbus:
1306
1538
# Emit D-Bus signal
1307
1539
client.GotSecret()
1311
1543
client.approvals_pending -= 1
1312
1544
try:
1313
1545
session.bye()
1314
except (gnutls.errors.GNUTLSError), error:
1546
except gnutls.errors.GNUTLSError as error:
1315
1547
logger.warning("GnuTLS bye failed")
1316
1548
1317
1549
@staticmethod
1328
1560
.gnutls_certificate_get_peers
1329
1561
(session._c_object, ctypes.byref(list_size)))
1330
1562
if not bool(cert_list) and list_size.value != 0:
1331
raise gnutls.errors.GNUTLSError(u"error getting peer"
1332
u" certificate")
1563
raise gnutls.errors.GNUTLSError("error getting peer"
1564
" certificate")
1333
1565
if list_size.value == 0:
1334
1566
return None
1335
1567
cert = cert_list[0]
1361
1593
if crtverify.value != 0:
1362
1594
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1363
1595
raise (gnutls.errors.CertificateSecurityError
1364
(u"Verify failed"))
1596
("Verify failed"))
1365
1597
# New buffer for the fingerprint
1366
1598
buf = ctypes.create_string_buffer(20)
1367
1599
buf_len = ctypes.c_size_t()
1374
1606
# Convert the buffer to a Python bytestring
1375
1607
fpr = ctypes.string_at(buf, buf_len.value)
1376
1608
# Convert the bytestring to hexadecimal notation
1377
hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
1609
hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
1378
1610
return hex_fpr
1379
1611
1380
1612
1386
1618
except:
1387
1619
self.handle_error(request, address)
1388
1620
self.close_request(request)
1389
1621
1390
1622
def process_request(self, request, address):
1391
1623
"""Start a new process to process the request."""
1392
multiprocessing.Process(target = self.sub_process_main,
1393
args = (request, address)).start()
1624
proc = multiprocessing.Process(target = self.sub_process_main,
1625
args = (request,
1626
address))
1627
proc.start()
1628
return proc
1629
1394
1630
1395
1631
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1396
1632
""" adds a pipe to the MixIn """
1400
1636
This function creates a new pipe in self.pipe
1401
1637
"""
1402
1638
parent_pipe, self.child_pipe = multiprocessing.Pipe()
1403
1404
super(MultiprocessingMixInWithPipe,
1405
self).process_request(request, client_address)
1639
1640
proc = MultiprocessingMixIn.process_request(self, request,
1641
client_address)
1406
1642
self.child_pipe.close()
1407
self.add_pipe(parent_pipe)
1408
1409
def add_pipe(self, parent_pipe):
1643
self.add_pipe(parent_pipe, proc)
1644
1645
def add_pipe(self, parent_pipe, proc):
1410
1646
"""Dummy function; override as necessary"""
1411
pass
1647
raise NotImplementedError
1648
1412
1649
1413
1650
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1414
1651
socketserver.TCPServer, object):
1432
1669
bind to an address or port if they were not specified."""
1433
1670
if self.interface is not None:
1434
1671
if SO_BINDTODEVICE is None:
1435
logger.error(u"SO_BINDTODEVICE does not exist;"
1436
u" cannot bind to interface %s",
1672
logger.error("SO_BINDTODEVICE does not exist;"
1673
" cannot bind to interface %s",
1437
1674
self.interface)
1438
1675
else:
1439
1676
try:
1440
1677
self.socket.setsockopt(socket.SOL_SOCKET,
1441
1678
SO_BINDTODEVICE,
1442
1679
str(self.interface
1443
+ u'\0'))
1444
except socket.error, error:
1680
+ '\0'))
1681
except socket.error as error:
1445
1682
if error[0] == errno.EPERM:
1446
logger.error(u"No permission to"
1447
u" bind to interface %s",
1683
logger.error("No permission to"
1684
" bind to interface %s",
1448
1685
self.interface)
1449
1686
elif error[0] == errno.ENOPROTOOPT:
1450
logger.error(u"SO_BINDTODEVICE not available;"
1451
u" cannot bind to interface %s",
1687
logger.error("SO_BINDTODEVICE not available;"
1688
" cannot bind to interface %s",
1452
1689
self.interface)
1453
1690
else:
1454
1691
raise
1456
1693
if self.server_address[0] or self.server_address[1]:
1457
1694
if not self.server_address[0]:
1458
1695
if self.address_family == socket.AF_INET6:
1459
any_address = u"::" # in6addr_any
1696
any_address = "::" # in6addr_any
1460
1697
else:
1461
1698
any_address = socket.INADDR_ANY
1462
1699
self.server_address = (any_address,
1489
1726
self.enabled = False
1490
1727
self.clients = clients
1491
1728
if self.clients is None:
1492
self.clients = set()
1729
self.clients = {}
1493
1730
self.use_dbus = use_dbus
1494
1731
self.gnutls_priority = gnutls_priority
1495
1732
IPv6_TCPServer.__init__(self, server_address,
1499
1736
def server_activate(self):
1500
1737
if self.enabled:
1501
1738
return socketserver.TCPServer.server_activate(self)
1739
1502
1740
def enable(self):
1503
1741
self.enabled = True
1504
def add_pipe(self, parent_pipe):
1742
1743
def add_pipe(self, parent_pipe, proc):
1505
1744
# Call "handle_ipc" for both data and EOF events
1506
1745
gobject.io_add_watch(parent_pipe.fileno(),
1507
1746
gobject.IO_IN | gobject.IO_HUP,
1508
1747
functools.partial(self.handle_ipc,
1509
parent_pipe = parent_pipe))
1510
1748
parent_pipe =
1749
parent_pipe,
1750
proc = proc))
1751
1511
1752
def handle_ipc(self, source, condition, parent_pipe=None,
1512
client_object=None):
1753
proc = None, client_object=None):
1513
1754
condition_names = {
1514
gobject.IO_IN: u"IN", # There is data to read.
1515
gobject.IO_OUT: u"OUT", # Data can be written (without
1755
gobject.IO_IN: "IN", # There is data to read.
1756
gobject.IO_OUT: "OUT", # Data can be written (without
1516
1757
# blocking).
1517
gobject.IO_PRI: u"PRI", # There is urgent data to read.
1518
gobject.IO_ERR: u"ERR", # Error condition.
1519
gobject.IO_HUP: u"HUP" # Hung up (the connection has been
1758
gobject.IO_PRI: "PRI", # There is urgent data to read.
1759
gobject.IO_ERR: "ERR", # Error condition.
1760
gobject.IO_HUP: "HUP" # Hung up (the connection has been
1520
1761
# broken, usually for pipes and
1521
1762
# sockets).
1522
1763
}
1524
1765
for cond, name in
1525
1766
condition_names.iteritems()
1526
1767
if cond & condition)
1527
# error or the other end of multiprocessing.Pipe has closed
1768
# error, or the other end of multiprocessing.Pipe has closed
1528
1769
if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
1770
# Wait for other process to exit
1771
proc.join()
1529
1772
return False
1530
1773
1531
1774
# Read a request from the child
1536
1779
fpr = request[1]
1537
1780
address = request[2]
1538
1781
1539
for c in self.clients:
1782
for c in self.clients.itervalues():
1540
1783
if c.fingerprint == fpr:
1541
1784
client = c
1542
1785
break
1543
1786
else:
1544
logger.warning(u"Client not found for fingerprint: %s, ad"
1545
u"dress: %s", fpr, address)
1787
logger.info("Client not found for fingerprint: %s, ad"
1788
"dress: %s", fpr, address)
1546
1789
if self.use_dbus:
1547
1790
# Emit D-Bus signal
1548
mandos_dbus_service.ClientNotFound(fpr, address[0])
1791
mandos_dbus_service.ClientNotFound(fpr,
1792
address[0])
1549
1793
parent_pipe.send(False)
1550
1794
return False
1551
1795
1552
1796
gobject.io_add_watch(parent_pipe.fileno(),
1553
1797
gobject.IO_IN | gobject.IO_HUP,
1554
1798
functools.partial(self.handle_ipc,
1555
parent_pipe = parent_pipe,
1556
client_object = client))
1799
parent_pipe =
1800
parent_pipe,
1801
proc = proc,
1802
client_object =
1803
client))
1557
1804
parent_pipe.send(True)
1558
# remove the old hook in favor of the new above hook on same fileno
1805
# remove the old hook in favor of the new above hook on
1806
# same fileno
1559
1807
return False
1560
1808
if command == 'funcall':
1561
1809
funcname = request[1]
1562
1810
args = request[2]
1563
1811
kwargs = request[3]
1564
1812
1565
parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
1566
1813
parent_pipe.send(('data', getattr(client_object,
1814
funcname)(*args,
1815
**kwargs)))
1816
1567
1817
if command == 'getattr':
1568
1818
attrname = request[1]
1569
1819
if callable(client_object.__getattribute__(attrname)):
1570
1820
parent_pipe.send(('function',))
1571
1821
else:
1572
parent_pipe.send(('data', client_object.__getattribute__(attrname)))
1822
parent_pipe.send(('data', client_object
1823
.__getattribute__(attrname)))
1573
1824
1574
1825
if command == 'setattr':
1575
1826
attrname = request[1]
1576
1827
value = request[2]
1577
1828
setattr(client_object, attrname, value)
1578
1829
1579
1830
return True
1580
1831
1581
1832
1582
1833
def string_to_delta(interval):
1583
1834
"""Parse a string and return a datetime.timedelta
1584
1835
1585
>>> string_to_delta(u'7d')
1836
>>> string_to_delta('7d')
1586
1837
datetime.timedelta(7)
1587
>>> string_to_delta(u'60s')
1838
>>> string_to_delta('60s')
1588
1839
datetime.timedelta(0, 60)
1589
>>> string_to_delta(u'60m')
1840
>>> string_to_delta('60m')
1590
1841
datetime.timedelta(0, 3600)
1591
>>> string_to_delta(u'24h')
1842
>>> string_to_delta('24h')
1592
1843
datetime.timedelta(1)
1593
>>> string_to_delta(u'1w')
1844
>>> string_to_delta('1w')
1594
1845
datetime.timedelta(7)
1595
>>> string_to_delta(u'5m 30s')
1846
>>> string_to_delta('5m 30s')
1596
1847
datetime.timedelta(0, 330)
1597
1848
"""
1598
1849
timevalue = datetime.timedelta(0)
1600
1851
try:
1601
1852
suffix = unicode(s[-1])
1602
1853
value = int(s[:-1])
1603
if suffix == u"d":
1854
if suffix == "d":
1604
1855
delta = datetime.timedelta(value)
1605
elif suffix == u"s":
1856
elif suffix == "s":
1606
1857
delta = datetime.timedelta(0, value)
1607
elif suffix == u"m":
1858
elif suffix == "m":
1608
1859
delta = datetime.timedelta(0, 0, 0, 0, value)
1609
elif suffix == u"h":
1860
elif suffix == "h":
1610
1861
delta = datetime.timedelta(0, 0, 0, 0, 0, value)
1611
elif suffix == u"w":
1862
elif suffix == "w":
1612
1863
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1613
1864
else:
1614
raise ValueError(u"Unknown suffix %r" % suffix)
1615
except (ValueError, IndexError), e:
1616
raise ValueError(e.message)
1865
raise ValueError("Unknown suffix %r" % suffix)
1866
except (ValueError, IndexError) as e:
1867
raise ValueError(*(e.args))
1617
1868
timevalue += delta
1618
1869
return timevalue
1619
1870
1620
1871
1621
def if_nametoindex(interface):
1622
"""Call the C function if_nametoindex(), or equivalent
1623
1624
Note: This function cannot accept a unicode string."""
1625
global if_nametoindex
1626
try:
1627
if_nametoindex = (ctypes.cdll.LoadLibrary
1628
(ctypes.util.find_library(u"c"))
1629
.if_nametoindex)
1630
except (OSError, AttributeError):
1631
logger.warning(u"Doing if_nametoindex the hard way")
1632
def if_nametoindex(interface):
1633
"Get an interface index the hard way, i.e. using fcntl()"
1634
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
1635
with contextlib.closing(socket.socket()) as s:
1636
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1637
struct.pack(str(u"16s16x"),
1638
interface))
1639
interface_index = struct.unpack(str(u"I"),
1640
ifreq[16:20])[0]
1641
return interface_index
1642
return if_nametoindex(interface)
1643
1644
1645
1872
def daemon(nochdir = False, noclose = False):
1646
1873
"""See daemon(3). Standard BSD Unix function.
1647
1874
1650
1877
sys.exit()
1651
1878
os.setsid()
1652
1879
if not nochdir:
1653
os.chdir(u"/")
1880
os.chdir("/")
1654
1881
if os.fork():
1655
1882
sys.exit()
1656
1883
if not noclose:
1658
1885
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1659
1886
if not stat.S_ISCHR(os.fstat(null).st_mode):
1660
1887
raise OSError(errno.ENODEV,
1661
u"%s not a character device"
1888
"%s not a character device"
1662
1889
% os.path.devnull)
1663
1890
os.dup2(null, sys.stdin.fileno())
1664
1891
os.dup2(null, sys.stdout.fileno())
1672
1899
##################################################################
1673
1900
# Parsing of options, both command line and config file
1674
1901
1675
parser = optparse.OptionParser(version = "%%prog %s" % version)
1676
parser.add_option("-i", u"--interface", type=u"string",
1677
metavar="IF", help=u"Bind to interface IF")
1678
parser.add_option("-a", u"--address", type=u"string",
1679
help=u"Address to listen for requests on")
1680
parser.add_option("-p", u"--port", type=u"int",
1681
help=u"Port number to receive requests on")
1682
parser.add_option("--check", action=u"store_true",
1683
help=u"Run self-test")
1684
parser.add_option("--debug", action=u"store_true",
1685
help=u"Debug mode; run in foreground and log to"
1686
u" terminal")
1687
parser.add_option("--debuglevel", type=u"string", metavar="LEVEL",
1688
help=u"Debug level for stdout output")
1689
parser.add_option("--priority", type=u"string", help=u"GnuTLS"
1690
u" priority string (see GnuTLS documentation)")
1691
parser.add_option("--servicename", type=u"string",
1692
metavar=u"NAME", help=u"Zeroconf service name")
1693
parser.add_option("--configdir", type=u"string",
1694
default=u"/etc/mandos", metavar=u"DIR",
1695
help=u"Directory to search for configuration"
1696
u" files")
1697
parser.add_option("--no-dbus", action=u"store_false",
1698
dest=u"use_dbus", help=u"Do not provide D-Bus"
1699
u" system bus interface")
1700
parser.add_option("--no-ipv6", action=u"store_false",
1701
dest=u"use_ipv6", help=u"Do not use IPv6")
1702
options = parser.parse_args()[0]
1902
parser = argparse.ArgumentParser()
1903
parser.add_argument("-v", "--version", action="version",
1904
version = "%%(prog)s %s" % version,
1905
help="show version number and exit")
1906
parser.add_argument("-i", "--interface", metavar="IF",
1907
help="Bind to interface IF")
1908
parser.add_argument("-a", "--address",
1909
help="Address to listen for requests on")
1910
parser.add_argument("-p", "--port", type=int,
1911
help="Port number to receive requests on")
1912
parser.add_argument("--check", action="store_true",
1913
help="Run self-test")
1914
parser.add_argument("--debug", action="store_true",
1915
help="Debug mode; run in foreground and log"
1916
" to terminal")
1917
parser.add_argument("--debuglevel", metavar="LEVEL",
1918
help="Debug level for stdout output")
1919
parser.add_argument("--priority", help="GnuTLS"
1920
" priority string (see GnuTLS documentation)")
1921
parser.add_argument("--servicename",
1922
metavar="NAME", help="Zeroconf service name")
1923
parser.add_argument("--configdir",
1924
default="/etc/mandos", metavar="DIR",
1925
help="Directory to search for configuration"
1926
" files")
1927
parser.add_argument("--no-dbus", action="store_false",
1928
dest="use_dbus", help="Do not provide D-Bus"
1929
" system bus interface")
1930
parser.add_argument("--no-ipv6", action="store_false",
1931
dest="use_ipv6", help="Do not use IPv6")
1932
parser.add_argument("--no-restore", action="store_false",
1933
dest="restore", help="Do not restore stored state",
1934
default=True)
1935
1936
options = parser.parse_args()
1703
1937
1704
1938
if options.check:
1705
1939
import doctest
1707
1941
sys.exit()
1708
1942
1709
1943
# Default values for config file for server-global settings
1710
server_defaults = { u"interface": u"",
1711
u"address": u"",
1712
u"port": u"",
1713
u"debug": u"False",
1714
u"priority":
1715
u"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1716
u"servicename": u"Mandos",
1717
u"use_dbus": u"True",
1718
u"use_ipv6": u"True",
1719
u"debuglevel": u"",
1944
server_defaults = { "interface": "",
1945
"address": "",
1946
"port": "",
1947
"debug": "False",
1948
"priority":
1949
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1950
"servicename": "Mandos",
1951
"use_dbus": "True",
1952
"use_ipv6": "True",
1953
"debuglevel": "",
1720
1954
}
1721
1955
1722
1956
# Parse config file for server-global settings
1723
1957
server_config = configparser.SafeConfigParser(server_defaults)
1724
1958
del server_defaults
1725
1959
server_config.read(os.path.join(options.configdir,
1726
u"mandos.conf"))
1960
"mandos.conf"))
1727
1961
# Convert the SafeConfigParser object to a dict
1728
1962
server_settings = server_config.defaults()
1729
1963
# Use the appropriate methods on the non-string config options
1730
for option in (u"debug", u"use_dbus", u"use_ipv6"):
1731
server_settings[option] = server_config.getboolean(u"DEFAULT",
1964
for option in ("debug", "use_dbus", "use_ipv6"):
1965
server_settings[option] = server_config.getboolean("DEFAULT",
1732
1966
option)
1733
1967
if server_settings["port"]:
1734
server_settings["port"] = server_config.getint(u"DEFAULT",
1735
u"port")
1968
server_settings["port"] = server_config.getint("DEFAULT",
1969
"port")
1736
1970
del server_config
1737
1971
1738
1972
# Override the settings from the config file with command line
1739
1973
# options, if set.
1740
for option in (u"interface", u"address", u"port", u"debug",
1741
u"priority", u"servicename", u"configdir",
1742
u"use_dbus", u"use_ipv6", u"debuglevel"):
1974
for option in ("interface", "address", "port", "debug",
1975
"priority", "servicename", "configdir",
1976
"use_dbus", "use_ipv6", "debuglevel", "restore"):
1743
1977
value = getattr(options, option)
1744
1978
if value is not None:
1745
1979
server_settings[option] = value
1753
1987
##################################################################
1754
1988
1755
1989
# For convenience
1756
debug = server_settings[u"debug"]
1757
debuglevel = server_settings[u"debuglevel"]
1758
use_dbus = server_settings[u"use_dbus"]
1759
use_ipv6 = server_settings[u"use_ipv6"]
1760
1761
if server_settings[u"servicename"] != u"Mandos":
1990
debug = server_settings["debug"]
1991
debuglevel = server_settings["debuglevel"]
1992
use_dbus = server_settings["use_dbus"]
1993
use_ipv6 = server_settings["use_ipv6"]
1994
1995
if debug:
1996
initlogger(logging.DEBUG)
1997
else:
1998
if not debuglevel:
1999
initlogger()
2000
else:
2001
level = getattr(logging, debuglevel.upper())
2002
initlogger(level)
2003
2004
if server_settings["servicename"] != "Mandos":
1762
2005
syslogger.setFormatter(logging.Formatter
1763
(u'Mandos (%s) [%%(process)d]:'
1764
u' %%(levelname)s: %%(message)s'
1765
% server_settings[u"servicename"]))
2006
('Mandos (%s) [%%(process)d]:'
2007
' %%(levelname)s: %%(message)s'
2008
% server_settings["servicename"]))
1766
2009
1767
2010
# Parse config file with clients
1768
client_defaults = { u"timeout": u"1h",
1769
u"interval": u"5m",
1770
u"checker": u"fping -q -- %%(host)s",
1771
u"host": u"",
1772
u"approval_delay": u"0s",
1773
u"approval_duration": u"1s",
2011
client_defaults = { "timeout": "5m",
2012
"extended_timeout": "15m",
2013
"interval": "2m",
2014
"checker": "fping -q -- %%(host)s",
2015
"host": "",
2016
"approval_delay": "0s",
2017
"approval_duration": "1s",
1774
2018
}
1775
2019
client_config = configparser.SafeConfigParser(client_defaults)
1776
client_config.read(os.path.join(server_settings[u"configdir"],
1777
u"clients.conf"))
2020
client_config.read(os.path.join(server_settings["configdir"],
2021
"clients.conf"))
1778
2022
1779
2023
global mandos_dbus_service
1780
2024
mandos_dbus_service = None
1781
2025
1782
tcp_server = MandosServer((server_settings[u"address"],
1783
server_settings[u"port"]),
2026
tcp_server = MandosServer((server_settings["address"],
2027
server_settings["port"]),
1784
2028
ClientHandler,
1785
interface=(server_settings[u"interface"]
2029
interface=(server_settings["interface"]
1786
2030
or None),
1787
2031
use_ipv6=use_ipv6,
1788
2032
gnutls_priority=
1789
server_settings[u"priority"],
2033
server_settings["priority"],
1790
2034
use_dbus=use_dbus)
1791
2035
if not debug:
1792
pidfilename = u"/var/run/mandos.pid"
2036
pidfilename = "/var/run/mandos.pid"
1793
2037
try:
1794
pidfile = open(pidfilename, u"w")
2038
pidfile = open(pidfilename, "w")
1795
2039
except IOError:
1796
logger.error(u"Could not open file %r", pidfilename)
2040
logger.error("Could not open file %r", pidfilename)
1797
2041
1798
2042
try:
1799
uid = pwd.getpwnam(u"_mandos").pw_uid
1800
gid = pwd.getpwnam(u"_mandos").pw_gid
2043
uid = pwd.getpwnam("_mandos").pw_uid
2044
gid = pwd.getpwnam("_mandos").pw_gid
1801
2045
except KeyError:
1802
2046
try:
1803
uid = pwd.getpwnam(u"mandos").pw_uid
1804
gid = pwd.getpwnam(u"mandos").pw_gid
2047
uid = pwd.getpwnam("mandos").pw_uid
2048
gid = pwd.getpwnam("mandos").pw_gid
1805
2049
except KeyError:
1806
2050
try:
1807
uid = pwd.getpwnam(u"nobody").pw_uid
1808
gid = pwd.getpwnam(u"nobody").pw_gid
2051
uid = pwd.getpwnam("nobody").pw_uid
2052
gid = pwd.getpwnam("nobody").pw_gid
1809
2053
except KeyError:
1810
2054
uid = 65534
1811
2055
gid = 65534
1812
2056
try:
1813
2057
os.setgid(gid)
1814
2058
os.setuid(uid)
1815
except OSError, error:
2059
except OSError as error:
1816
2060
if error[0] != errno.EPERM:
1817
2061
raise error
1818
2062
1819
if not debug and not debuglevel:
1820
syslogger.setLevel(logging.WARNING)
1821
console.setLevel(logging.WARNING)
1822
if debuglevel:
1823
level = getattr(logging, debuglevel.upper())
1824
syslogger.setLevel(level)
1825
console.setLevel(level)
1826
1827
2063
if debug:
1828
2064
# Enable all possible GnuTLS debugging
1829
2065
1833
2069
1834
2070
@gnutls.library.types.gnutls_log_func
1835
2071
def debug_gnutls(level, string):
1836
logger.debug(u"GnuTLS: %s", string[:-1])
2072
logger.debug("GnuTLS: %s", string[:-1])
1837
2073
1838
2074
(gnutls.library.functions
1839
2075
.gnutls_global_set_log_function(debug_gnutls))
1847
2083
# No console logging
1848
2084
logger.removeHandler(console)
1849
2085
2086
# Need to fork before connecting to D-Bus
2087
if not debug:
2088
# Close all input and output, do double fork, etc.
2089
daemon()
1850
2090
1851
2091
global main_loop
1852
2092
# From the Avahi example code
1856
2096
# End of Avahi example code
1857
2097
if use_dbus:
1858
2098
try:
1859
bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos",
2099
bus_name = dbus.service.BusName("se.recompile.Mandos",
1860
2100
bus, do_not_queue=True)
1861
except dbus.exceptions.NameExistsException, e:
1862
logger.error(unicode(e) + u", disabling D-Bus")
2101
old_bus_name = (dbus.service.BusName
2102
("se.bsnet.fukt.Mandos", bus,
2103
do_not_queue=True))
2104
except dbus.exceptions.NameExistsException as e:
2105
logger.error(unicode(e) + ", disabling D-Bus")
1863
2106
use_dbus = False
1864
server_settings[u"use_dbus"] = False
2107
server_settings["use_dbus"] = False
1865
2108
tcp_server.use_dbus = False
1866
2109
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1867
service = AvahiService(name = server_settings[u"servicename"],
1868
servicetype = u"_mandos._tcp",
1869
protocol = protocol, bus = bus)
2110
service = AvahiServiceToSyslog(name =
2111
server_settings["servicename"],
2112
servicetype = "_mandos._tcp",
2113
protocol = protocol, bus = bus)
1870
2114
if server_settings["interface"]:
1871
2115
service.interface = (if_nametoindex
1872
(str(server_settings[u"interface"])))
1873
1874
if not debug:
1875
# Close all input and output, do double fork, etc.
1876
daemon()
1877
2116
(str(server_settings["interface"])))
2117
1878
2118
global multiprocessing_manager
1879
2119
multiprocessing_manager = multiprocessing.Manager()
1880
2120
1881
2121
client_class = Client
1882
2122
if use_dbus:
1883
client_class = functools.partial(ClientDBus, bus = bus)
1884
def client_config_items(config, section):
1885
special_settings = {
1886
"approved_by_default":
1887
lambda: config.getboolean(section,
1888
"approved_by_default"),
1889
}
1890
for name, value in config.items(section):
2123
client_class = functools.partial(ClientDBusTransitional,
2124
bus = bus)
2125
2126
special_settings = {
2127
# Some settings need to be accessd by special methods;
2128
# booleans need .getboolean(), etc. Here is a list of them:
2129
"approved_by_default":
2130
lambda section:
2131
client_config.getboolean(section, "approved_by_default"),
2132
}
2133
# Construct a new dict of client settings of this form:
2134
# { client_name: {setting_name: value, ...}, ...}
2135
# with exceptions for any special settings as defined above
2136
client_settings = dict((clientname,
2137
dict((setting,
2138
(value if setting not in special_settings
2139
else special_settings[setting](clientname)))
2140
for setting, value in client_config.items(clientname)))
2141
for clientname in client_config.sections())
2142
2143
old_client_settings = {}
2144
clients_data = []
2145
2146
# Get client data and settings from last running state.
2147
if server_settings["restore"]:
2148
try:
2149
with open(stored_state_path, "rb") as stored_state:
2150
clients_data, old_client_settings = pickle.load(stored_state)
2151
os.remove(stored_state_path)
2152
except IOError as e:
2153
logger.warning("Could not load persistant state: {0}".format(e))
2154
if e.errno != errno.ENOENT:
2155
raise
2156
2157
for client in clients_data:
2158
client_name = client["name"]
2159
2160
# Decide which value to use after restoring saved state.
2161
# We have three different values: Old config file,
2162
# new config file, and saved state.
2163
# New config value takes precedence if it differs from old
2164
# config value, otherwise use saved state.
2165
for name, value in client_settings[client_name].items():
1891
2166
try:
1892
yield (name, special_settings[name]())
2167
# For each value in new config, check if it differs
2168
# from the old config value (Except for the "secret"
2169
# attribute)
2170
if name != "secret" and value != old_client_settings[client_name][name]:
2171
setattr(client, name, value)
1893
2172
except KeyError:
1894
yield (name, value)
2173
pass
2174
2175
# Clients who has passed its expire date, can still be enabled if its
2176
# last checker was sucessful. Clients who checkers failed before we
2177
# stored it state is asumed to had failed checker during downtime.
2178
if client["enabled"] and client["last_checked_ok"]:
2179
if ((datetime.datetime.utcnow() - client["last_checked_ok"])
2180
> client["interval"]):
2181
if client["last_checker_status"] != 0:
2182
client["enabled"] = False
2183
else:
2184
client["expires"] = datetime.datetime.utcnow() + client["timeout"]
2185
2186
client["changedstate"] = (multiprocessing_manager
2187
.Condition(multiprocessing_manager
2188
.Lock()))
2189
if use_dbus:
2190
new_client = ClientDBusTransitional.__new__(ClientDBusTransitional)
2191
tcp_server.clients[client_name] = new_client
2192
new_client.bus = bus
2193
for name, value in client.iteritems():
2194
setattr(new_client, name, value)
2195
client_object_name = unicode(client_name).translate(
2196
{ord("."): ord("_"),
2197
ord("-"): ord("_")})
2198
new_client.dbus_object_path = (dbus.ObjectPath
2199
("/clients/" + client_object_name))
2200
DBusObjectWithProperties.__init__(new_client,
2201
new_client.bus,
2202
new_client.dbus_object_path)
2203
else:
2204
tcp_server.clients[client_name] = Client.__new__(Client)
2205
for name, value in client.iteritems():
2206
setattr(tcp_server.clients[client_name], name, value)
2207
2208
tcp_server.clients[client_name].decrypt_secret(
2209
client_settings[client_name]["secret"])
2210
2211
# Create/remove clients based on new changes made to config
2212
for clientname in set(old_client_settings) - set(client_settings):
2213
del tcp_server.clients[clientname]
2214
for clientname in set(client_settings) - set(old_client_settings):
2215
tcp_server.clients[clientname] = (client_class(name = clientname,
2216
config =
2217
client_settings
2218
[clientname]))
1895
2219
1896
tcp_server.clients.update(set(
1897
client_class(name = section,
1898
config= dict(client_config_items(
1899
client_config, section)))
1900
for section in client_config.sections()))
2220
1901
2221
if not tcp_server.clients:
1902
logger.warning(u"No clients defined")
2222
logger.warning("No clients defined")
1903
2223
1904
2224
if not debug:
1905
2225
try:
1906
2226
with pidfile:
1907
2227
pid = os.getpid()
1908
pidfile.write(str(pid) + "\n")
2228
pidfile.write(str(pid) + "\n".encode("utf-8"))
1909
2229
del pidfile
1910
2230
except IOError:
1911
logger.error(u"Could not write to file %r with PID %d",
2231
logger.error("Could not write to file %r with PID %d",
1912
2232
pidfilename, pid)
1913
2233
except NameError:
1914
2234
# "pidfile" was never created
1916
2236
del pidfilename
1917
2237
1918
2238
signal.signal(signal.SIGINT, signal.SIG_IGN)
1919
2239
1920
2240
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1921
2241
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
1922
2242
1924
2244
class MandosDBusService(dbus.service.Object):
1925
2245
"""A D-Bus proxy object"""
1926
2246
def __init__(self):
1927
dbus.service.Object.__init__(self, bus, u"/")
1928
_interface = u"se.bsnet.fukt.Mandos"
2247
dbus.service.Object.__init__(self, bus, "/")
2248
_interface = "se.recompile.Mandos"
1929
2249
1930
@dbus.service.signal(_interface, signature=u"o")
2250
@dbus.service.signal(_interface, signature="o")
1931
2251
def ClientAdded(self, objpath):
1932
2252
"D-Bus signal"
1933
2253
pass
1934
2254
1935
@dbus.service.signal(_interface, signature=u"ss")
2255
@dbus.service.signal(_interface, signature="ss")
1936
2256
def ClientNotFound(self, fingerprint, address):
1937
2257
"D-Bus signal"
1938
2258
pass
1939
2259
1940
@dbus.service.signal(_interface, signature=u"os")
2260
@dbus.service.signal(_interface, signature="os")
1941
2261
def ClientRemoved(self, objpath, name):
1942
2262
"D-Bus signal"
1943
2263
pass
1944
2264
1945
@dbus.service.method(_interface, out_signature=u"ao")
2265
@dbus.service.method(_interface, out_signature="ao")
1946
2266
def GetAllClients(self):
1947
2267
"D-Bus method"
1948
2268
return dbus.Array(c.dbus_object_path
1949
for c in tcp_server.clients)
2269
for c in
2270
tcp_server.clients.itervalues())
1950
2271
1951
2272
@dbus.service.method(_interface,
1952
out_signature=u"a{oa{sv}}")
2273
out_signature="a{oa{sv}}")
1953
2274
def GetAllClientsWithProperties(self):
1954
2275
"D-Bus method"
1955
2276
return dbus.Dictionary(
1956
((c.dbus_object_path, c.GetAll(u""))
1957
for c in tcp_server.clients),
1958
signature=u"oa{sv}")
2277
((c.dbus_object_path, c.GetAll(""))
2278
for c in tcp_server.clients.itervalues()),
2279
signature="oa{sv}")
1959
2280
1960
@dbus.service.method(_interface, in_signature=u"o")
2281
@dbus.service.method(_interface, in_signature="o")
1961
2282
def RemoveClient(self, object_path):
1962
2283
"D-Bus method"
1963
for c in tcp_server.clients:
2284
for c in tcp_server.clients.itervalues():
1964
2285
if c.dbus_object_path == object_path:
1965
tcp_server.clients.remove(c)
2286
del tcp_server.clients[c.name]
1966
2287
c.remove_from_connection()
1967
2288
# Don't signal anything except ClientRemoved
1968
2289
c.disable(quiet=True)
1973
2294
1974
2295
del _interface
1975
2296
1976
mandos_dbus_service = MandosDBusService()
2297
class MandosDBusServiceTransitional(MandosDBusService):
2298
__metaclass__ = AlternateDBusNamesMetaclass
2299
mandos_dbus_service = MandosDBusServiceTransitional()
1977
2300
1978
2301
def cleanup():
1979
2302
"Cleanup function; run on exit"
1980
2303
service.cleanup()
1981
2304
2305
multiprocessing.active_children()
2306
if not (tcp_server.clients or client_settings):
2307
return
2308
2309
# Store client before exiting. Secrets are encrypted with key based
2310
# on what config file has. If config file is removed/edited, old
2311
# secret will thus be unrecovable.
2312
clients = []
2313
for client in tcp_server.clients.itervalues():
2314
client.encrypt_secret(client_settings[client.name]["secret"])
2315
2316
client_dict = {}
2317
2318
# A list of attributes that will not be stored when shuting down.
2319
exclude = set(("bus", "changedstate", "secret"))
2320
for name, typ in inspect.getmembers(dbus.service.Object):
2321
exclude.add(name)
2322
2323
client_dict["encrypted_secret"] = client.encrypted_secret
2324
for attr in client.client_structure:
2325
if attr not in exclude:
2326
client_dict[attr] = getattr(client, attr)
2327
2328
clients.append(client_dict)
2329
del client_settings[client.name]["secret"]
2330
2331
try:
2332
with os.fdopen(os.open(stored_state_path, os.O_CREAT|os.O_WRONLY|os.O_TRUNC, 0600), "wb") as stored_state:
2333
pickle.dump((clients, client_settings), stored_state)
2334
except IOError as e:
2335
logger.warning("Could not save persistant state: {0}".format(e))
2336
if e.errno != errno.ENOENT:
2337
raise
2338
2339
# Delete all clients, and settings from config
1982
2340
while tcp_server.clients:
1983
client = tcp_server.clients.pop()
2341
name, client = tcp_server.clients.popitem()
1984
2342
if use_dbus:
1985
2343
client.remove_from_connection()
1986
client.disable_hook = None
1987
2344
# Don't signal anything except ClientRemoved
1988
2345
client.disable(quiet=True)
1989
2346
if use_dbus:
1990
2347
# Emit D-Bus signal
1991
mandos_dbus_service.ClientRemoved(client.dbus_object_path,
2348
mandos_dbus_service.ClientRemoved(client
2349
.dbus_object_path,
1992
2350
client.name)
2351
client_settings.clear()
1993
2352
1994
2353
atexit.register(cleanup)
1995
2354
1996
for client in tcp_server.clients:
2355
for client in tcp_server.clients.itervalues():
1997
2356
if use_dbus:
1998
2357
# Emit D-Bus signal
1999
2358
mandos_dbus_service.ClientAdded(client.dbus_object_path)
2000
client.enable()
2359
# Need to initiate checking of clients
2360
if client.enabled:
2361
client.init_checker()
2362
2001
2363
2002
2364
tcp_server.enable()
2003
2365
tcp_server.server_activate()
2005
2367
# Find out what port we got
2006
2368
service.port = tcp_server.socket.getsockname()[1]
2007
2369
if use_ipv6:
2008
logger.info(u"Now listening on address %r, port %d,"
2370
logger.info("Now listening on address %r, port %d,"
2009
2371
" flowinfo %d, scope_id %d"
2010
2372
% tcp_server.socket.getsockname())
2011
2373
else: # IPv4
2012
logger.info(u"Now listening on address %r, port %d"
2374
logger.info("Now listening on address %r, port %d"
2013
2375
% tcp_server.socket.getsockname())
2014
2376
2015
2377
#service.interface = tcp_server.socket.getsockname()[3]
2018
2380
# From the Avahi example code
2019
2381
try:
2020
2382
service.activate()
2021
except dbus.exceptions.DBusException, error:
2022
logger.critical(u"DBusException: %s", error)
2383
except dbus.exceptions.DBusException as error:
2384
logger.critical("DBusException: %s", error)
2023
2385
cleanup()
2024
2386
sys.exit(1)
2025
2387
# End of Avahi example code
2029
2391
(tcp_server.handle_request
2030
2392
(*args[2:], **kwargs) or True))
2031
2393
2032
logger.debug(u"Starting main loop")
2394
logger.debug("Starting main loop")
2033
2395
main_loop.run()
2034
except AvahiError, error:
2035
logger.critical(u"AvahiError: %s", error)
2396
except AvahiError as error:
2397
logger.critical("AvahiError: %s", error)
2036
2398
cleanup()
2037
2399
sys.exit(1)
2038
2400
except KeyboardInterrupt:
2039
2401
if debug:
2040
print >> sys.stderr
2041
logger.debug(u"Server received KeyboardInterrupt")
2042
logger.debug(u"Server exiting")
2402
print("", file=sys.stderr)
2403
logger.debug("Server received KeyboardInterrupt")
2404
logger.debug("Server exiting")
2043
2405
# Must run before the D-Bus bus name gets deregistered
2044
2406
cleanup()
2045
2407
2408
2046
2409
if __name__ == '__main__':
2047
2410
main()
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0