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