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