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