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