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