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