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