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 482
- compare with another revision
- download diff
- download tarball
- view history from revision 482
- Committer: Teddy Hogeborn
- Date: 2011-04-02 06:37:18 UTC
- Revision ID: teddy@fukt.bsnet.se-20110402063718-13ldrcuu0t33sdc4
* mandos: Tolerate restarting Avahi servers. Also Changed to new
"except x as y" exception syntax.
(AvahiService.entry_group_state_changed_match): New; contains the
SignalMatch object.
(AvahiService.remove): Really remove the group and the signal
connection, if any.
(AvahiService.add): Always create a new group and signal connection.
(AvahiService.cleanup): Changed to simply call remove().
(AvahiService.server_state_changed): Handle and log more bad states.
(AvahiService.activate): Set "follow_name_owner_changes=True" on the
Avahi Server proxy object.
(ClientDBus.checked_ok): Do not return anything.
(ClientDBus.CheckedOK): Do not return anything, as documented.
* mandos-monitor: Call D-Bus methods asynchronously.
"except x as y" exception syntax.
(AvahiService.entry_group_state_changed_match): New; contains the
SignalMatch object.
(AvahiService.remove): Really remove the group and the signal
connection, if any.
(AvahiService.add): Always create a new group and signal connection.
(AvahiService.cleanup): Changed to simply call remove().
(AvahiService.server_state_changed): Handle and log more bad states.
(AvahiService.activate): Set "follow_name_owner_changes=True" on the
Avahi Server proxy object.
(ClientDBus.checked_ok): Do not return anything.
(ClientDBus.CheckedOK): Do not return anything, as documented.
* mandos-monitor: Call D-Bus methods asynchronously.
- files added:
- DBUS-API
- debian/source
- files modified:
- .bzrignore
added
removed
mandos
11
11
# "AvahiService" class, and some lines in "main".
12
12
#
13
13
# Everything else is
14
# Copyright © 2008,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
31
31
# Contact the authors at <mandos@fukt.bsnet.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
55
56
import logging
56
57
import logging.handlers
57
58
import pwd
58
from contextlib import closing
59
import contextlib
59
60
import struct
60
61
import fcntl
61
62
import functools
63
import cPickle as pickle
64
import multiprocessing
62
65
63
66
import dbus
64
67
import dbus.service
79
82
SO_BINDTODEVICE = None
80
83
81
84
82
version = "1.0.12"
85
version = "1.3.0"
83
86
84
logger = logging.Logger(u'mandos')
87
#logger = logging.getLogger('mandos')
88
logger = logging.Logger('mandos')
85
89
syslogger = (logging.handlers.SysLogHandler
86
90
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
87
address = "/dev/log"))
91
address = str("/dev/log")))
88
92
syslogger.setFormatter(logging.Formatter
89
(u'Mandos [%(process)d]: %(levelname)s:'
90
u' %(message)s'))
93
('Mandos [%(process)d]: %(levelname)s:'
94
' %(message)s'))
91
95
logger.addHandler(syslogger)
92
96
93
97
console = logging.StreamHandler()
94
console.setFormatter(logging.Formatter(u'%(name)s [%(process)d]:'
95
u' %(levelname)s:'
96
u' %(message)s'))
98
console.setFormatter(logging.Formatter('%(name)s [%(process)d]:'
99
' %(levelname)s:'
100
' %(message)s'))
97
101
logger.addHandler(console)
98
102
99
103
class AvahiError(Exception):
116
120
Attributes:
117
121
interface: integer; avahi.IF_UNSPEC or an interface index.
118
122
Used to optionally bind to the specified interface.
119
name: string; Example: u'Mandos'
120
type: string; Example: u'_mandos._tcp'.
123
name: string; Example: 'Mandos'
124
type: string; Example: '_mandos._tcp'.
121
125
See <http://www.dns-sd.org/ServiceTypes.html>
122
126
port: integer; what port to announce
123
127
TXT: list of strings; TXT record for the service
132
136
"""
133
137
def __init__(self, interface = avahi.IF_UNSPEC, name = None,
134
138
servicetype = None, port = None, TXT = None,
135
domain = u"", host = u"", max_renames = 32768,
139
domain = "", host = "", max_renames = 32768,
136
140
protocol = avahi.PROTO_UNSPEC, bus = None):
137
141
self.interface = interface
138
142
self.name = name
147
151
self.group = None # our entry group
148
152
self.server = None
149
153
self.bus = bus
154
self.entry_group_state_changed_match = None
150
155
def rename(self):
151
156
"""Derived from the Avahi example code"""
152
157
if self.rename_count >= self.max_renames:
153
logger.critical(u"No suitable Zeroconf service name found"
154
u" after %i retries, exiting.",
158
logger.critical("No suitable Zeroconf service name found"
159
" after %i retries, exiting.",
155
160
self.rename_count)
156
raise AvahiServiceError(u"Too many renames")
157
self.name = self.server.GetAlternativeServiceName(self.name)
158
logger.info(u"Changing Zeroconf service name to %r ...",
159
unicode(self.name))
161
raise AvahiServiceError("Too many renames")
162
self.name = unicode(self.server.GetAlternativeServiceName(self.name))
163
logger.info("Changing Zeroconf service name to %r ...",
164
self.name)
160
165
syslogger.setFormatter(logging.Formatter
161
(u'Mandos (%s) [%%(process)d]:'
162
u' %%(levelname)s: %%(message)s'
166
('Mandos (%s) [%%(process)d]:'
167
' %%(levelname)s: %%(message)s'
163
168
% self.name))
164
169
self.remove()
165
self.add()
170
try:
171
self.add()
172
except dbus.exceptions.DBusException as error:
173
logger.critical("DBusException: %s", error)
174
self.cleanup()
175
os._exit(1)
166
176
self.rename_count += 1
167
177
def remove(self):
168
178
"""Derived from the Avahi example code"""
169
179
if self.group is not None:
170
self.group.Reset()
180
try:
181
self.group.Free()
182
except (dbus.exceptions.UnknownMethodException,
183
dbus.exceptions.DBusException) as e:
184
pass
185
self.group = None
186
if self.entry_group_state_changed_match is not None:
187
self.entry_group_state_changed_match.remove()
188
self.entry_group_state_changed_match = None
171
189
def add(self):
172
190
"""Derived from the Avahi example code"""
173
if self.group is None:
174
self.group = dbus.Interface(
175
self.bus.get_object(avahi.DBUS_NAME,
176
self.server.EntryGroupNew()),
177
avahi.DBUS_INTERFACE_ENTRY_GROUP)
178
self.group.connect_to_signal('StateChanged',
179
self
180
.entry_group_state_changed)
181
logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
191
self.remove()
192
self.group = dbus.Interface(
193
self.bus.get_object(avahi.DBUS_NAME,
194
self.server.EntryGroupNew(),
195
follow_name_owner_changes=True),
196
avahi.DBUS_INTERFACE_ENTRY_GROUP)
197
self.entry_group_state_changed_match = (
198
self.group.connect_to_signal(
199
'StateChanged', self .entry_group_state_changed))
200
logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
182
201
self.name, self.type)
183
202
self.group.AddService(
184
203
self.interface,
191
210
self.group.Commit()
192
211
def entry_group_state_changed(self, state, error):
193
212
"""Derived from the Avahi example code"""
194
logger.debug(u"Avahi state change: %i", state)
213
logger.debug("Avahi entry group state change: %i", state)
195
214
196
215
if state == avahi.ENTRY_GROUP_ESTABLISHED:
197
logger.debug(u"Zeroconf service established.")
216
logger.debug("Zeroconf service established.")
198
217
elif state == avahi.ENTRY_GROUP_COLLISION:
199
logger.warning(u"Zeroconf service name collision.")
218
logger.info("Zeroconf service name collision.")
200
219
self.rename()
201
220
elif state == avahi.ENTRY_GROUP_FAILURE:
202
logger.critical(u"Avahi: Error in group state changed %s",
221
logger.critical("Avahi: Error in group state changed %s",
203
222
unicode(error))
204
raise AvahiGroupError(u"State changed: %s"
223
raise AvahiGroupError("State changed: %s"
205
224
% unicode(error))
206
225
def cleanup(self):
207
226
"""Derived from the Avahi example code"""
208
if self.group is not None:
209
self.group.Free()
210
self.group = None
211
def server_state_changed(self, state):
227
self.remove()
228
def server_state_changed(self, state, error=None):
212
229
"""Derived from the Avahi example code"""
213
if state == avahi.SERVER_COLLISION:
214
logger.error(u"Zeroconf server name collision")
230
logger.debug("Avahi server state change: %i", state)
231
bad_states = { avahi.SERVER_INVALID:
232
"Zeroconf server invalid",
233
avahi.SERVER_REGISTERING: None,
234
avahi.SERVER_COLLISION:
235
"Zeroconf server name collision",
236
avahi.SERVER_FAILURE:
237
"Zeroconf server failure" }
238
if state in bad_states:
239
if bad_states[state]:
240
logger.error(bad_states[state])
215
241
self.remove()
216
242
elif state == avahi.SERVER_RUNNING:
217
243
self.add()
244
else:
245
logger.debug("Unknown state: %r", state)
218
246
def activate(self):
219
247
"""Derived from the Avahi example code"""
220
248
if self.server is None:
221
249
self.server = dbus.Interface(
222
250
self.bus.get_object(avahi.DBUS_NAME,
223
avahi.DBUS_PATH_SERVER),
251
avahi.DBUS_PATH_SERVER,
252
follow_name_owner_changes=True),
224
253
avahi.DBUS_INTERFACE_SERVER)
225
self.server.connect_to_signal(u"StateChanged",
254
self.server.connect_to_signal("StateChanged",
226
255
self.server_state_changed)
227
256
self.server_state_changed(self.server.GetState())
228
257
231
260
"""A representation of a client host served by this server.
232
261
233
262
Attributes:
234
name: string; from the config file, used in log messages and
235
D-Bus identifiers
236
fingerprint: string (40 or 32 hexadecimal digits); used to
237
uniquely identify the client
238
secret: bytestring; sent verbatim (over TLS) to client
239
host: string; available for use by the checker command
240
created: datetime.datetime(); (UTC) object creation
241
last_enabled: datetime.datetime(); (UTC)
242
enabled: bool()
243
last_checked_ok: datetime.datetime(); (UTC) or None
244
timeout: datetime.timedelta(); How long from last_checked_ok
245
until this client is invalid
246
interval: datetime.timedelta(); How often to start a new checker
247
disable_hook: If set, called by disable() as disable_hook(self)
263
_approved: bool(); 'None' if not yet approved/disapproved
264
approval_delay: datetime.timedelta(); Time to wait for approval
265
approval_duration: datetime.timedelta(); Duration of one approval
248
266
checker: subprocess.Popen(); a running checker process used
249
267
to see if the client lives.
250
268
'None' if no process is running.
251
checker_initiator_tag: a gobject event source tag, or None
252
disable_initiator_tag: - '' -
253
checker_callback_tag: - '' -
254
checker_command: string; External command which is run to check if
255
client lives. %() expansions are done at
269
checker_callback_tag: a gobject event source tag, or None
270
checker_command: string; External command which is run to check
271
if client lives. %() expansions are done at
256
272
runtime with vars(self) as dict, so that for
257
273
instance %(name)s can be used in the command.
274
checker_initiator_tag: a gobject event source tag, or None
275
created: datetime.datetime(); (UTC) object creation
258
276
current_checker_command: string; current running checker_command
277
disable_hook: If set, called by disable() as disable_hook(self)
278
disable_initiator_tag: a gobject event source tag, or None
279
enabled: bool()
280
fingerprint: string (40 or 32 hexadecimal digits); used to
281
uniquely identify the client
282
host: string; available for use by the checker command
283
interval: datetime.timedelta(); How often to start a new checker
284
last_approval_request: datetime.datetime(); (UTC) or None
285
last_checked_ok: datetime.datetime(); (UTC) or None
286
last_enabled: datetime.datetime(); (UTC)
287
name: string; from the config file, used in log messages and
288
D-Bus identifiers
289
secret: bytestring; sent verbatim (over TLS) to client
290
timeout: datetime.timedelta(); How long from last_checked_ok
291
until this client is disabled
292
runtime_expansions: Allowed attributes for runtime expansion.
259
293
"""
260
294
295
runtime_expansions = ("approval_delay", "approval_duration",
296
"created", "enabled", "fingerprint",
297
"host", "interval", "last_checked_ok",
298
"last_enabled", "name", "timeout")
299
261
300
@staticmethod
262
301
def _timedelta_to_milliseconds(td):
263
302
"Convert a datetime.timedelta() to milliseconds"
272
311
def interval_milliseconds(self):
273
312
"Return the 'interval' attribute in milliseconds"
274
313
return self._timedelta_to_milliseconds(self.interval)
314
315
def approval_delay_milliseconds(self):
316
return self._timedelta_to_milliseconds(self.approval_delay)
275
317
276
318
def __init__(self, name = None, disable_hook=None, config=None):
277
319
"""Note: the 'checker' key in 'config' sets the
280
322
self.name = name
281
323
if config is None:
282
324
config = {}
283
logger.debug(u"Creating client %r", self.name)
325
logger.debug("Creating client %r", self.name)
284
326
# Uppercase and remove spaces from fingerprint for later
285
327
# comparison purposes with return value from the fingerprint()
286
328
# function
287
self.fingerprint = (config[u"fingerprint"].upper()
288
.replace(u" ", u""))
289
logger.debug(u" Fingerprint: %s", self.fingerprint)
290
if u"secret" in config:
291
self.secret = config[u"secret"].decode(u"base64")
292
elif u"secfile" in config:
293
with closing(open(os.path.expanduser
294
(os.path.expandvars
295
(config[u"secfile"])))) as secfile:
329
self.fingerprint = (config["fingerprint"].upper()
330
.replace(" ", ""))
331
logger.debug(" Fingerprint: %s", self.fingerprint)
332
if "secret" in config:
333
self.secret = config["secret"].decode("base64")
334
elif "secfile" in config:
335
with open(os.path.expanduser(os.path.expandvars
336
(config["secfile"])),
337
"rb") as secfile:
296
338
self.secret = secfile.read()
297
339
else:
298
raise TypeError(u"No secret or secfile for client %s"
340
raise TypeError("No secret or secfile for client %s"
299
341
% self.name)
300
self.host = config.get(u"host", u"")
342
self.host = config.get("host", "")
301
343
self.created = datetime.datetime.utcnow()
302
344
self.enabled = False
345
self.last_approval_request = None
303
346
self.last_enabled = None
304
347
self.last_checked_ok = None
305
self.timeout = string_to_delta(config[u"timeout"])
306
self.interval = string_to_delta(config[u"interval"])
348
self.timeout = string_to_delta(config["timeout"])
349
self.interval = string_to_delta(config["interval"])
307
350
self.disable_hook = disable_hook
308
351
self.checker = None
309
352
self.checker_initiator_tag = None
310
353
self.disable_initiator_tag = None
311
354
self.checker_callback_tag = None
312
self.checker_command = config[u"checker"]
355
self.checker_command = config["checker"]
313
356
self.current_checker_command = None
314
357
self.last_connect = None
358
self._approved = None
359
self.approved_by_default = config.get("approved_by_default",
360
True)
361
self.approvals_pending = 0
362
self.approval_delay = string_to_delta(
363
config["approval_delay"])
364
self.approval_duration = string_to_delta(
365
config["approval_duration"])
366
self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
315
367
368
def send_changedstate(self):
369
self.changedstate.acquire()
370
self.changedstate.notify_all()
371
self.changedstate.release()
372
316
373
def enable(self):
317
374
"""Start this client's checker and timeout hooks"""
318
if getattr(self, u"enabled", False):
375
if getattr(self, "enabled", False):
319
376
# Already enabled
320
377
return
378
self.send_changedstate()
321
379
self.last_enabled = datetime.datetime.utcnow()
322
380
# Schedule a new checker to be started an 'interval' from now,
323
381
# and every interval from then on.
324
382
self.checker_initiator_tag = (gobject.timeout_add
325
383
(self.interval_milliseconds(),
326
384
self.start_checker))
327
# Also start a new checker *right now*.
328
self.start_checker()
329
385
# Schedule a disable() when 'timeout' has passed
330
386
self.disable_initiator_tag = (gobject.timeout_add
331
387
(self.timeout_milliseconds(),
332
388
self.disable))
333
389
self.enabled = True
390
# Also start a new checker *right now*.
391
self.start_checker()
334
392
335
def disable(self):
393
def disable(self, quiet=True):
336
394
"""Disable this client."""
337
395
if not getattr(self, "enabled", False):
338
396
return False
339
logger.info(u"Disabling client %s", self.name)
340
if getattr(self, u"disable_initiator_tag", False):
397
if not quiet:
398
self.send_changedstate()
399
if not quiet:
400
logger.info("Disabling client %s", self.name)
401
if getattr(self, "disable_initiator_tag", False):
341
402
gobject.source_remove(self.disable_initiator_tag)
342
403
self.disable_initiator_tag = None
343
if getattr(self, u"checker_initiator_tag", False):
404
if getattr(self, "checker_initiator_tag", False):
344
405
gobject.source_remove(self.checker_initiator_tag)
345
406
self.checker_initiator_tag = None
346
407
self.stop_checker()
361
422
if os.WIFEXITED(condition):
362
423
exitstatus = os.WEXITSTATUS(condition)
363
424
if exitstatus == 0:
364
logger.info(u"Checker for %(name)s succeeded",
425
logger.info("Checker for %(name)s succeeded",
365
426
vars(self))
366
427
self.checked_ok()
367
428
else:
368
logger.info(u"Checker for %(name)s failed",
429
logger.info("Checker for %(name)s failed",
369
430
vars(self))
370
431
else:
371
logger.warning(u"Checker for %(name)s crashed?",
432
logger.warning("Checker for %(name)s crashed?",
372
433
vars(self))
373
434
374
435
def checked_ok(self):
383
444
(self.timeout_milliseconds(),
384
445
self.disable))
385
446
447
def need_approval(self):
448
self.last_approval_request = datetime.datetime.utcnow()
449
386
450
def start_checker(self):
387
451
"""Start a new checker subprocess if one is not running.
388
452
394
458
# client would inevitably timeout, since no checker would get
395
459
# a chance to run to completion. If we instead leave running
396
460
# checkers alone, the checker would have to take more time
397
# than 'timeout' for the client to be declared invalid, which
398
# is as it should be.
461
# than 'timeout' for the client to be disabled, which is as it
462
# should be.
399
463
400
464
# If a checker exists, make sure it is not a zombie
401
if self.checker is not None:
465
try:
402
466
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
467
except (AttributeError, OSError) as error:
468
if (isinstance(error, OSError)
469
and error.errno != errno.ECHILD):
470
raise error
471
else:
403
472
if pid:
404
logger.warning(u"Checker was a zombie")
473
logger.warning("Checker was a zombie")
405
474
gobject.source_remove(self.checker_callback_tag)
406
475
self.checker_callback(pid, status,
407
476
self.current_checker_command)
412
481
command = self.checker_command % self.host
413
482
except TypeError:
414
483
# Escape attributes for the shell
415
escaped_attrs = dict((key,
416
re.escape(unicode(str(val),
417
errors=
418
u'replace')))
419
for key, val in
420
vars(self).iteritems())
484
escaped_attrs = dict(
485
(attr,
486
re.escape(unicode(str(getattr(self, attr, "")),
487
errors=
488
'replace')))
489
for attr in
490
self.runtime_expansions)
491
421
492
try:
422
493
command = self.checker_command % escaped_attrs
423
except TypeError, error:
424
logger.error(u'Could not format string "%s":'
425
u' %s', self.checker_command, error)
494
except TypeError as error:
495
logger.error('Could not format string "%s":'
496
' %s', self.checker_command, error)
426
497
return True # Try again later
427
498
self.current_checker_command = command
428
499
try:
429
logger.info(u"Starting checker %r for %s",
500
logger.info("Starting checker %r for %s",
430
501
command, self.name)
431
502
# We don't need to redirect stdout and stderr, since
432
503
# in normal mode, that is already done by daemon(),
434
505
# always replaced by /dev/null.)
435
506
self.checker = subprocess.Popen(command,
436
507
close_fds=True,
437
shell=True, cwd=u"/")
508
shell=True, cwd="/")
438
509
self.checker_callback_tag = (gobject.child_watch_add
439
510
(self.checker.pid,
440
511
self.checker_callback,
445
516
if pid:
446
517
gobject.source_remove(self.checker_callback_tag)
447
518
self.checker_callback(pid, status, command)
448
except OSError, error:
449
logger.error(u"Failed to start subprocess: %s",
519
except OSError as error:
520
logger.error("Failed to start subprocess: %s",
450
521
error)
451
522
# Re-run this periodically if run by gobject.timeout_add
452
523
return True
456
527
if self.checker_callback_tag:
457
528
gobject.source_remove(self.checker_callback_tag)
458
529
self.checker_callback_tag = None
459
if getattr(self, u"checker", None) is None:
530
if getattr(self, "checker", None) is None:
460
531
return
461
logger.debug(u"Stopping checker for %(name)s", vars(self))
532
logger.debug("Stopping checker for %(name)s", vars(self))
462
533
try:
463
534
os.kill(self.checker.pid, signal.SIGTERM)
464
#os.sleep(0.5)
535
#time.sleep(0.5)
465
536
#if self.checker.poll() is None:
466
537
# os.kill(self.checker.pid, signal.SIGKILL)
467
except OSError, error:
538
except OSError as error:
468
539
if error.errno != errno.ESRCH: # No such process
469
540
raise
470
541
self.checker = None
471
472
def still_valid(self):
473
"""Has the timeout not yet passed for this client?"""
474
if not getattr(self, u"enabled", False):
475
return False
476
now = datetime.datetime.utcnow()
477
if self.last_checked_ok is None:
478
return now < (self.created + self.timeout)
479
else:
480
return now < (self.last_checked_ok + self.timeout)
481
482
483
def dbus_service_property(dbus_interface, signature=u"v",
484
access=u"readwrite", byte_arrays=False):
542
543
def dbus_service_property(dbus_interface, signature="v",
544
access="readwrite", byte_arrays=False):
485
545
"""Decorators for marking methods of a DBusObjectWithProperties to
486
546
become properties on the D-Bus.
487
547
492
552
dbus.service.method, except there is only "signature", since the
493
553
type from Get() and the type sent to Set() is the same.
494
554
"""
555
# Encoding deeply encoded byte arrays is not supported yet by the
556
# "Set" method, so we fail early here:
557
if byte_arrays and signature != "ay":
558
raise ValueError("Byte arrays not supported for non-'ay'"
559
" signature %r" % signature)
495
560
def decorator(func):
496
561
func._dbus_is_property = True
497
562
func._dbus_interface = dbus_interface
498
563
func._dbus_signature = signature
499
564
func._dbus_access = access
500
565
func._dbus_name = func.__name__
501
if func._dbus_name.endswith(u"_dbus_property"):
566
if func._dbus_name.endswith("_dbus_property"):
502
567
func._dbus_name = func._dbus_name[:-14]
503
func._dbus_get_args_options = {u'byte_arrays': byte_arrays }
568
func._dbus_get_args_options = {'byte_arrays': byte_arrays }
504
569
return func
505
570
return decorator
506
571
534
599
535
600
@staticmethod
536
601
def _is_dbus_property(obj):
537
return getattr(obj, u"_dbus_is_property", False)
602
return getattr(obj, "_dbus_is_property", False)
538
603
539
604
def _get_all_dbus_properties(self):
540
605
"""Returns a generator of (name, attribute) pairs
548
613
property with the specified name and interface.
549
614
"""
550
615
for name in (property_name,
551
property_name + u"_dbus_property"):
616
property_name + "_dbus_property"):
552
617
prop = getattr(self, name, None)
553
618
if (prop is None
554
619
or not self._is_dbus_property(prop)
558
623
continue
559
624
return prop
560
625
# No such property
561
raise DBusPropertyNotFound(self.dbus_object_path + u":"
562
+ interface_name + u"."
626
raise DBusPropertyNotFound(self.dbus_object_path + ":"
627
+ interface_name + "."
563
628
+ property_name)
564
629
565
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ss",
566
out_signature=u"v")
630
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
631
out_signature="v")
567
632
def Get(self, interface_name, property_name):
568
633
"""Standard D-Bus property Get() method, see D-Bus standard.
569
634
"""
570
635
prop = self._get_dbus_property(interface_name, property_name)
571
if prop._dbus_access == u"write":
636
if prop._dbus_access == "write":
572
637
raise DBusPropertyAccessException(property_name)
573
638
value = prop()
574
if not hasattr(value, u"variant_level"):
639
if not hasattr(value, "variant_level"):
575
640
return value
576
641
return type(value)(value, variant_level=value.variant_level+1)
577
642
578
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ssv")
643
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
579
644
def Set(self, interface_name, property_name, value):
580
645
"""Standard D-Bus property Set() method, see D-Bus standard.
581
646
"""
582
647
prop = self._get_dbus_property(interface_name, property_name)
583
if prop._dbus_access == u"read":
648
if prop._dbus_access == "read":
584
649
raise DBusPropertyAccessException(property_name)
585
if prop._dbus_get_args_options[u"byte_arrays"]:
650
if prop._dbus_get_args_options["byte_arrays"]:
651
# The byte_arrays option is not supported yet on
652
# signatures other than "ay".
653
if prop._dbus_signature != "ay":
654
raise ValueError
586
655
value = dbus.ByteArray(''.join(unichr(byte)
587
656
for byte in value))
588
657
prop(value)
589
658
590
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"s",
591
out_signature=u"a{sv}")
659
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
660
out_signature="a{sv}")
592
661
def GetAll(self, interface_name):
593
662
"""Standard D-Bus property GetAll() method, see D-Bus
594
663
standard.
602
671
# Interface non-empty but did not match
603
672
continue
604
673
# Ignore write-only properties
605
if prop._dbus_access == u"write":
674
if prop._dbus_access == "write":
606
675
continue
607
676
value = prop()
608
if not hasattr(value, u"variant_level"):
677
if not hasattr(value, "variant_level"):
609
678
all[name] = value
610
679
continue
611
680
all[name] = type(value)(value, variant_level=
612
681
value.variant_level+1)
613
return dbus.Dictionary(all, signature=u"sv")
682
return dbus.Dictionary(all, signature="sv")
614
683
615
684
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
616
out_signature=u"s",
685
out_signature="s",
617
686
path_keyword='object_path',
618
687
connection_keyword='connection')
619
688
def Introspect(self, object_path, connection):
620
689
"""Standard D-Bus method, overloaded to insert property tags.
621
690
"""
622
691
xmlstring = dbus.service.Object.Introspect(self, object_path,
623
connection)
624
document = xml.dom.minidom.parseString(xmlstring)
625
del xmlstring
626
def make_tag(document, name, prop):
627
e = document.createElement(u"property")
628
e.setAttribute(u"name", name)
629
e.setAttribute(u"type", prop._dbus_signature)
630
e.setAttribute(u"access", prop._dbus_access)
631
return e
632
for if_tag in document.getElementsByTagName(u"interface"):
633
for tag in (make_tag(document, name, prop)
634
for name, prop
635
in self._get_all_dbus_properties()
636
if prop._dbus_interface
637
== if_tag.getAttribute(u"name")):
638
if_tag.appendChild(tag)
639
xmlstring = document.toxml(u"utf-8")
640
document.unlink()
692
connection)
693
try:
694
document = xml.dom.minidom.parseString(xmlstring)
695
def make_tag(document, name, prop):
696
e = document.createElement("property")
697
e.setAttribute("name", name)
698
e.setAttribute("type", prop._dbus_signature)
699
e.setAttribute("access", prop._dbus_access)
700
return e
701
for if_tag in document.getElementsByTagName("interface"):
702
for tag in (make_tag(document, name, prop)
703
for name, prop
704
in self._get_all_dbus_properties()
705
if prop._dbus_interface
706
== if_tag.getAttribute("name")):
707
if_tag.appendChild(tag)
708
# Add the names to the return values for the
709
# "org.freedesktop.DBus.Properties" methods
710
if (if_tag.getAttribute("name")
711
== "org.freedesktop.DBus.Properties"):
712
for cn in if_tag.getElementsByTagName("method"):
713
if cn.getAttribute("name") == "Get":
714
for arg in cn.getElementsByTagName("arg"):
715
if (arg.getAttribute("direction")
716
== "out"):
717
arg.setAttribute("name", "value")
718
elif cn.getAttribute("name") == "GetAll":
719
for arg in cn.getElementsByTagName("arg"):
720
if (arg.getAttribute("direction")
721
== "out"):
722
arg.setAttribute("name", "props")
723
xmlstring = document.toxml("utf-8")
724
document.unlink()
725
except (AttributeError, xml.dom.DOMException,
726
xml.parsers.expat.ExpatError) as error:
727
logger.error("Failed to override Introspection method",
728
error)
641
729
return xmlstring
642
730
643
731
648
736
dbus_object_path: dbus.ObjectPath
649
737
bus: dbus.SystemBus()
650
738
"""
739
740
runtime_expansions = (Client.runtime_expansions
741
+ ("dbus_object_path",))
742
651
743
# dbus.service.Object doesn't use super(), so we can't either.
652
744
653
745
def __init__(self, bus = None, *args, **kwargs):
746
self._approvals_pending = 0
654
747
self.bus = bus
655
748
Client.__init__(self, *args, **kwargs)
656
749
# Only now, when this client is initialized, can it show up on
657
750
# the D-Bus
751
client_object_name = unicode(self.name).translate(
752
{ord("."): ord("_"),
753
ord("-"): ord("_")})
658
754
self.dbus_object_path = (dbus.ObjectPath
659
(u"/clients/"
660
+ self.name.replace(u".", u"_")))
755
("/clients/" + client_object_name))
661
756
DBusObjectWithProperties.__init__(self, self.bus,
662
757
self.dbus_object_path)
758
759
def _get_approvals_pending(self):
760
return self._approvals_pending
761
def _set_approvals_pending(self, value):
762
old_value = self._approvals_pending
763
self._approvals_pending = value
764
bval = bool(value)
765
if (hasattr(self, "dbus_object_path")
766
and bval is not bool(old_value)):
767
dbus_bool = dbus.Boolean(bval, variant_level=1)
768
self.PropertyChanged(dbus.String("ApprovalPending"),
769
dbus_bool)
770
771
approvals_pending = property(_get_approvals_pending,
772
_set_approvals_pending)
773
del _get_approvals_pending, _set_approvals_pending
663
774
664
775
@staticmethod
665
776
def _datetime_to_dbus(dt, variant_level=0):
668
779
variant_level=variant_level)
669
780
670
781
def enable(self):
671
oldstate = getattr(self, u"enabled", False)
782
oldstate = getattr(self, "enabled", False)
672
783
r = Client.enable(self)
673
784
if oldstate != self.enabled:
674
785
# Emit D-Bus signals
675
self.PropertyChanged(dbus.String(u"enabled"),
786
self.PropertyChanged(dbus.String("Enabled"),
676
787
dbus.Boolean(True, variant_level=1))
677
788
self.PropertyChanged(
678
dbus.String(u"last_enabled"),
789
dbus.String("LastEnabled"),
679
790
self._datetime_to_dbus(self.last_enabled,
680
791
variant_level=1))
681
792
return r
682
793
683
def disable(self, signal = True):
684
oldstate = getattr(self, u"enabled", False)
685
r = Client.disable(self)
686
if signal and oldstate != self.enabled:
794
def disable(self, quiet = False):
795
oldstate = getattr(self, "enabled", False)
796
r = Client.disable(self, quiet=quiet)
797
if not quiet and oldstate != self.enabled:
687
798
# Emit D-Bus signal
688
self.PropertyChanged(dbus.String(u"enabled"),
799
self.PropertyChanged(dbus.String("Enabled"),
689
800
dbus.Boolean(False, variant_level=1))
690
801
return r
691
802
694
805
self.remove_from_connection()
695
806
except LookupError:
696
807
pass
697
if hasattr(DBusObjectWithProperties, u"__del__"):
808
if hasattr(DBusObjectWithProperties, "__del__"):
698
809
DBusObjectWithProperties.__del__(self, *args, **kwargs)
699
810
Client.__del__(self, *args, **kwargs)
700
811
703
814
self.checker_callback_tag = None
704
815
self.checker = None
705
816
# Emit D-Bus signal
706
self.PropertyChanged(dbus.String(u"checker_running"),
817
self.PropertyChanged(dbus.String("CheckerRunning"),
707
818
dbus.Boolean(False, variant_level=1))
708
819
if os.WIFEXITED(condition):
709
820
exitstatus = os.WEXITSTATUS(condition)
721
832
*args, **kwargs)
722
833
723
834
def checked_ok(self, *args, **kwargs):
724
r = Client.checked_ok(self, *args, **kwargs)
835
Client.checked_ok(self, *args, **kwargs)
725
836
# Emit D-Bus signal
726
837
self.PropertyChanged(
727
dbus.String(u"last_checked_ok"),
838
dbus.String("LastCheckedOK"),
728
839
(self._datetime_to_dbus(self.last_checked_ok,
729
840
variant_level=1)))
841
842
def need_approval(self, *args, **kwargs):
843
r = Client.need_approval(self, *args, **kwargs)
844
# Emit D-Bus signal
845
self.PropertyChanged(
846
dbus.String("LastApprovalRequest"),
847
(self._datetime_to_dbus(self.last_approval_request,
848
variant_level=1)))
730
849
return r
731
850
732
851
def start_checker(self, *args, **kwargs):
742
861
# Emit D-Bus signal
743
862
self.CheckerStarted(self.current_checker_command)
744
863
self.PropertyChanged(
745
dbus.String(u"checker_running"),
864
dbus.String("CheckerRunning"),
746
865
dbus.Boolean(True, variant_level=1))
747
866
return r
748
867
749
868
def stop_checker(self, *args, **kwargs):
750
old_checker = getattr(self, u"checker", None)
869
old_checker = getattr(self, "checker", None)
751
870
r = Client.stop_checker(self, *args, **kwargs)
752
871
if (old_checker is not None
753
and getattr(self, u"checker", None) is None):
754
self.PropertyChanged(dbus.String(u"checker_running"),
872
and getattr(self, "checker", None) is None):
873
self.PropertyChanged(dbus.String("CheckerRunning"),
755
874
dbus.Boolean(False, variant_level=1))
756
875
return r
757
758
## D-Bus methods & signals
759
_interface = u"se.bsnet.fukt.Mandos.Client"
760
761
# CheckedOK - method
762
@dbus.service.method(_interface)
763
def CheckedOK(self):
764
return self.checked_ok()
876
877
def _reset_approved(self):
878
self._approved = None
879
return False
880
881
def approve(self, value=True):
882
self.send_changedstate()
883
self._approved = value
884
gobject.timeout_add(self._timedelta_to_milliseconds
885
(self.approval_duration),
886
self._reset_approved)
887
888
889
## D-Bus methods, signals & properties
890
_interface = "se.bsnet.fukt.Mandos.Client"
891
892
## Signals
765
893
766
894
# CheckerCompleted - signal
767
@dbus.service.signal(_interface, signature=u"nxs")
895
@dbus.service.signal(_interface, signature="nxs")
768
896
def CheckerCompleted(self, exitcode, waitstatus, command):
769
897
"D-Bus signal"
770
898
pass
771
899
772
900
# CheckerStarted - signal
773
@dbus.service.signal(_interface, signature=u"s")
901
@dbus.service.signal(_interface, signature="s")
774
902
def CheckerStarted(self, command):
775
903
"D-Bus signal"
776
904
pass
777
905
778
906
# PropertyChanged - signal
779
@dbus.service.signal(_interface, signature=u"sv")
907
@dbus.service.signal(_interface, signature="sv")
780
908
def PropertyChanged(self, property, value):
781
909
"D-Bus signal"
782
910
pass
783
911
784
# ReceivedSecret - signal
912
# GotSecret - signal
785
913
@dbus.service.signal(_interface)
786
def ReceivedSecret(self):
787
"D-Bus signal"
914
def GotSecret(self):
915
"""D-Bus signal
916
Is sent after a successful transfer of secret from the Mandos
917
server to mandos-client
918
"""
788
919
pass
789
920
790
921
# Rejected - signal
791
@dbus.service.signal(_interface)
792
def Rejected(self):
922
@dbus.service.signal(_interface, signature="s")
923
def Rejected(self, reason):
793
924
"D-Bus signal"
794
925
pass
795
926
927
# NeedApproval - signal
928
@dbus.service.signal(_interface, signature="tb")
929
def NeedApproval(self, timeout, default):
930
"D-Bus signal"
931
return self.need_approval()
932
933
## Methods
934
935
# Approve - method
936
@dbus.service.method(_interface, in_signature="b")
937
def Approve(self, value):
938
self.approve(value)
939
940
# CheckedOK - method
941
@dbus.service.method(_interface)
942
def CheckedOK(self):
943
self.checked_ok()
944
796
945
# Enable - method
797
946
@dbus.service.method(_interface)
798
947
def Enable(self):
816
965
def StopChecker(self):
817
966
self.stop_checker()
818
967
819
# name - property
820
@dbus_service_property(_interface, signature=u"s", access=u"read")
821
def name_dbus_property(self):
968
## Properties
969
970
# ApprovalPending - property
971
@dbus_service_property(_interface, signature="b", access="read")
972
def ApprovalPending_dbus_property(self):
973
return dbus.Boolean(bool(self.approvals_pending))
974
975
# ApprovedByDefault - property
976
@dbus_service_property(_interface, signature="b",
977
access="readwrite")
978
def ApprovedByDefault_dbus_property(self, value=None):
979
if value is None: # get
980
return dbus.Boolean(self.approved_by_default)
981
self.approved_by_default = bool(value)
982
# Emit D-Bus signal
983
self.PropertyChanged(dbus.String("ApprovedByDefault"),
984
dbus.Boolean(value, variant_level=1))
985
986
# ApprovalDelay - property
987
@dbus_service_property(_interface, signature="t",
988
access="readwrite")
989
def ApprovalDelay_dbus_property(self, value=None):
990
if value is None: # get
991
return dbus.UInt64(self.approval_delay_milliseconds())
992
self.approval_delay = datetime.timedelta(0, 0, 0, value)
993
# Emit D-Bus signal
994
self.PropertyChanged(dbus.String("ApprovalDelay"),
995
dbus.UInt64(value, variant_level=1))
996
997
# ApprovalDuration - property
998
@dbus_service_property(_interface, signature="t",
999
access="readwrite")
1000
def ApprovalDuration_dbus_property(self, value=None):
1001
if value is None: # get
1002
return dbus.UInt64(self._timedelta_to_milliseconds(
1003
self.approval_duration))
1004
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1005
# Emit D-Bus signal
1006
self.PropertyChanged(dbus.String("ApprovalDuration"),
1007
dbus.UInt64(value, variant_level=1))
1008
1009
# Name - property
1010
@dbus_service_property(_interface, signature="s", access="read")
1011
def Name_dbus_property(self):
822
1012
return dbus.String(self.name)
823
1013
824
# fingerprint - property
825
@dbus_service_property(_interface, signature=u"s", access=u"read")
826
def fingerprint_dbus_property(self):
1014
# Fingerprint - property
1015
@dbus_service_property(_interface, signature="s", access="read")
1016
def Fingerprint_dbus_property(self):
827
1017
return dbus.String(self.fingerprint)
828
1018
829
# host - property
830
@dbus_service_property(_interface, signature=u"s",
831
access=u"readwrite")
832
def host_dbus_property(self, value=None):
1019
# Host - property
1020
@dbus_service_property(_interface, signature="s",
1021
access="readwrite")
1022
def Host_dbus_property(self, value=None):
833
1023
if value is None: # get
834
1024
return dbus.String(self.host)
835
1025
self.host = value
836
1026
# Emit D-Bus signal
837
self.PropertyChanged(dbus.String(u"host"),
1027
self.PropertyChanged(dbus.String("Host"),
838
1028
dbus.String(value, variant_level=1))
839
1029
840
# created - property
841
@dbus_service_property(_interface, signature=u"s", access=u"read")
842
def created_dbus_property(self):
1030
# Created - property
1031
@dbus_service_property(_interface, signature="s", access="read")
1032
def Created_dbus_property(self):
843
1033
return dbus.String(self._datetime_to_dbus(self.created))
844
1034
845
# last_enabled - property
846
@dbus_service_property(_interface, signature=u"s", access=u"read")
847
def last_enabled_dbus_property(self):
1035
# LastEnabled - property
1036
@dbus_service_property(_interface, signature="s", access="read")
1037
def LastEnabled_dbus_property(self):
848
1038
if self.last_enabled is None:
849
return dbus.String(u"")
1039
return dbus.String("")
850
1040
return dbus.String(self._datetime_to_dbus(self.last_enabled))
851
1041
852
# enabled - property
853
@dbus_service_property(_interface, signature=u"b",
854
access=u"readwrite")
855
def enabled_dbus_property(self, value=None):
1042
# Enabled - property
1043
@dbus_service_property(_interface, signature="b",
1044
access="readwrite")
1045
def Enabled_dbus_property(self, value=None):
856
1046
if value is None: # get
857
1047
return dbus.Boolean(self.enabled)
858
1048
if value:
860
1050
else:
861
1051
self.disable()
862
1052
863
# last_checked_ok - property
864
@dbus_service_property(_interface, signature=u"s",
865
access=u"readwrite")
866
def last_checked_ok_dbus_property(self, value=None):
1053
# LastCheckedOK - property
1054
@dbus_service_property(_interface, signature="s",
1055
access="readwrite")
1056
def LastCheckedOK_dbus_property(self, value=None):
867
1057
if value is not None:
868
1058
self.checked_ok()
869
1059
return
870
1060
if self.last_checked_ok is None:
871
return dbus.String(u"")
1061
return dbus.String("")
872
1062
return dbus.String(self._datetime_to_dbus(self
873
1063
.last_checked_ok))
874
1064
875
# timeout - property
876
@dbus_service_property(_interface, signature=u"t",
877
access=u"readwrite")
878
def timeout_dbus_property(self, value=None):
1065
# LastApprovalRequest - property
1066
@dbus_service_property(_interface, signature="s", access="read")
1067
def LastApprovalRequest_dbus_property(self):
1068
if self.last_approval_request is None:
1069
return dbus.String("")
1070
return dbus.String(self.
1071
_datetime_to_dbus(self
1072
.last_approval_request))
1073
1074
# Timeout - property
1075
@dbus_service_property(_interface, signature="t",
1076
access="readwrite")
1077
def Timeout_dbus_property(self, value=None):
879
1078
if value is None: # get
880
1079
return dbus.UInt64(self.timeout_milliseconds())
881
1080
self.timeout = datetime.timedelta(0, 0, 0, value)
882
1081
# Emit D-Bus signal
883
self.PropertyChanged(dbus.String(u"timeout"),
1082
self.PropertyChanged(dbus.String("Timeout"),
884
1083
dbus.UInt64(value, variant_level=1))
885
if getattr(self, u"disable_initiator_tag", None) is None:
1084
if getattr(self, "disable_initiator_tag", None) is None:
886
1085
return
887
1086
# Reschedule timeout
888
1087
gobject.source_remove(self.disable_initiator_tag)
900
1099
self.disable_initiator_tag = (gobject.timeout_add
901
1100
(time_to_die, self.disable))
902
1101
903
# interval - property
904
@dbus_service_property(_interface, signature=u"t",
905
access=u"readwrite")
906
def interval_dbus_property(self, value=None):
1102
# Interval - property
1103
@dbus_service_property(_interface, signature="t",
1104
access="readwrite")
1105
def Interval_dbus_property(self, value=None):
907
1106
if value is None: # get
908
1107
return dbus.UInt64(self.interval_milliseconds())
909
1108
self.interval = datetime.timedelta(0, 0, 0, value)
910
1109
# Emit D-Bus signal
911
self.PropertyChanged(dbus.String(u"interval"),
1110
self.PropertyChanged(dbus.String("Interval"),
912
1111
dbus.UInt64(value, variant_level=1))
913
if getattr(self, u"checker_initiator_tag", None) is None:
1112
if getattr(self, "checker_initiator_tag", None) is None:
914
1113
return
915
1114
# Reschedule checker run
916
1115
gobject.source_remove(self.checker_initiator_tag)
918
1117
(value, self.start_checker))
919
1118
self.start_checker() # Start one now, too
920
1119
921
# checker - property
922
@dbus_service_property(_interface, signature=u"s",
923
access=u"readwrite")
924
def checker_dbus_property(self, value=None):
1120
# Checker - property
1121
@dbus_service_property(_interface, signature="s",
1122
access="readwrite")
1123
def Checker_dbus_property(self, value=None):
925
1124
if value is None: # get
926
1125
return dbus.String(self.checker_command)
927
1126
self.checker_command = value
928
1127
# Emit D-Bus signal
929
self.PropertyChanged(dbus.String(u"checker"),
1128
self.PropertyChanged(dbus.String("Checker"),
930
1129
dbus.String(self.checker_command,
931
1130
variant_level=1))
932
1131
933
# checker_running - property
934
@dbus_service_property(_interface, signature=u"b",
935
access=u"readwrite")
936
def checker_running_dbus_property(self, value=None):
1132
# CheckerRunning - property
1133
@dbus_service_property(_interface, signature="b",
1134
access="readwrite")
1135
def CheckerRunning_dbus_property(self, value=None):
937
1136
if value is None: # get
938
1137
return dbus.Boolean(self.checker is not None)
939
1138
if value:
941
1140
else:
942
1141
self.stop_checker()
943
1142
944
# object_path - property
945
@dbus_service_property(_interface, signature=u"o", access=u"read")
946
def object_path_dbus_property(self):
1143
# ObjectPath - property
1144
@dbus_service_property(_interface, signature="o", access="read")
1145
def ObjectPath_dbus_property(self):
947
1146
return self.dbus_object_path # is already a dbus.ObjectPath
948
1147
949
# secret = property
950
@dbus_service_property(_interface, signature=u"ay",
951
access=u"write", byte_arrays=True)
952
def secret_dbus_property(self, value):
1148
# Secret = property
1149
@dbus_service_property(_interface, signature="ay",
1150
access="write", byte_arrays=True)
1151
def Secret_dbus_property(self, value):
953
1152
self.secret = str(value)
954
1153
955
1154
del _interface
956
1155
957
1156
1157
class ProxyClient(object):
1158
def __init__(self, child_pipe, fpr, address):
1159
self._pipe = child_pipe
1160
self._pipe.send(('init', fpr, address))
1161
if not self._pipe.recv():
1162
raise KeyError()
1163
1164
def __getattribute__(self, name):
1165
if(name == '_pipe'):
1166
return super(ProxyClient, self).__getattribute__(name)
1167
self._pipe.send(('getattr', name))
1168
data = self._pipe.recv()
1169
if data[0] == 'data':
1170
return data[1]
1171
if data[0] == 'function':
1172
def func(*args, **kwargs):
1173
self._pipe.send(('funcall', name, args, kwargs))
1174
return self._pipe.recv()[1]
1175
return func
1176
1177
def __setattr__(self, name, value):
1178
if(name == '_pipe'):
1179
return super(ProxyClient, self).__setattr__(name, value)
1180
self._pipe.send(('setattr', name, value))
1181
1182
958
1183
class ClientHandler(socketserver.BaseRequestHandler, object):
959
1184
"""A class to handle client connections.
960
1185
962
1187
Note: This will run in its own forked process."""
963
1188
964
1189
def handle(self):
965
logger.info(u"TCP connection from: %s",
966
unicode(self.client_address))
967
logger.debug(u"IPC Pipe FD: %d", self.server.pipe[1])
968
# Open IPC pipe to parent process
969
with closing(os.fdopen(self.server.pipe[1], u"w", 1)) as ipc:
1190
with contextlib.closing(self.server.child_pipe) as child_pipe:
1191
logger.info("TCP connection from: %s",
1192
unicode(self.client_address))
1193
logger.debug("Pipe FD: %d",
1194
self.server.child_pipe.fileno())
1195
970
1196
session = (gnutls.connection
971
1197
.ClientSession(self.request,
972
1198
gnutls.connection
973
1199
.X509Credentials()))
974
975
line = self.request.makefile().readline()
976
logger.debug(u"Protocol version: %r", line)
977
try:
978
if int(line.strip().split()[0]) > 1:
979
raise RuntimeError
980
except (ValueError, IndexError, RuntimeError), error:
981
logger.error(u"Unknown protocol version: %s", error)
982
return
983
1200
984
1201
# Note: gnutls.connection.X509Credentials is really a
985
1202
# generic GnuTLS certificate credentials object so long as
986
1203
# no X.509 keys are added to it. Therefore, we can use it
987
1204
# here despite using OpenPGP certificates.
988
989
#priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
990
# u"+AES-256-CBC", u"+SHA1",
991
# u"+COMP-NULL", u"+CTYPE-OPENPGP",
992
# u"+DHE-DSS"))
1205
1206
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1207
# "+AES-256-CBC", "+SHA1",
1208
# "+COMP-NULL", "+CTYPE-OPENPGP",
1209
# "+DHE-DSS"))
993
1210
# Use a fallback default, since this MUST be set.
994
1211
priority = self.server.gnutls_priority
995
1212
if priority is None:
996
priority = u"NORMAL"
1213
priority = "NORMAL"
997
1214
(gnutls.library.functions
998
1215
.gnutls_priority_set_direct(session._c_object,
999
1216
priority, None))
1000
1217
1218
# Start communication using the Mandos protocol
1219
# Get protocol number
1220
line = self.request.makefile().readline()
1221
logger.debug("Protocol version: %r", line)
1222
try:
1223
if int(line.strip().split()[0]) > 1:
1224
raise RuntimeError
1225
except (ValueError, IndexError, RuntimeError) as error:
1226
logger.error("Unknown protocol version: %s", error)
1227
return
1228
1229
# Start GnuTLS connection
1001
1230
try:
1002
1231
session.handshake()
1003
except gnutls.errors.GNUTLSError, error:
1004
logger.warning(u"Handshake failed: %s", error)
1232
except gnutls.errors.GNUTLSError as error:
1233
logger.warning("Handshake failed: %s", error)
1005
1234
# Do not run session.bye() here: the session is not
1006
1235
# established. Just abandon the request.
1007
1236
return
1008
logger.debug(u"Handshake succeeded")
1237
logger.debug("Handshake succeeded")
1238
1239
approval_required = False
1009
1240
try:
1010
fpr = self.fingerprint(self.peer_certificate(session))
1011
except (TypeError, gnutls.errors.GNUTLSError), error:
1012
logger.warning(u"Bad certificate: %s", error)
1013
session.bye()
1014
return
1015
logger.debug(u"Fingerprint: %s", fpr)
1241
try:
1242
fpr = self.fingerprint(self.peer_certificate
1243
(session))
1244
except (TypeError,
1245
gnutls.errors.GNUTLSError) as error:
1246
logger.warning("Bad certificate: %s", error)
1247
return
1248
logger.debug("Fingerprint: %s", fpr)
1249
1250
try:
1251
client = ProxyClient(child_pipe, fpr,
1252
self.client_address)
1253
except KeyError:
1254
return
1255
1256
if client.approval_delay:
1257
delay = client.approval_delay
1258
client.approvals_pending += 1
1259
approval_required = True
1260
1261
while True:
1262
if not client.enabled:
1263
logger.warning("Client %s is disabled",
1264
client.name)
1265
if self.server.use_dbus:
1266
# Emit D-Bus signal
1267
client.Rejected("Disabled")
1268
return
1269
1270
if client._approved or not client.approval_delay:
1271
#We are approved or approval is disabled
1272
break
1273
elif client._approved is None:
1274
logger.info("Client %s needs approval",
1275
client.name)
1276
if self.server.use_dbus:
1277
# Emit D-Bus signal
1278
client.NeedApproval(
1279
client.approval_delay_milliseconds(),
1280
client.approved_by_default)
1281
else:
1282
logger.warning("Client %s was not approved",
1283
client.name)
1284
if self.server.use_dbus:
1285
# Emit D-Bus signal
1286
client.Rejected("Denied")
1287
return
1288
1289
#wait until timeout or approved
1290
#x = float(client._timedelta_to_milliseconds(delay))
1291
time = datetime.datetime.now()
1292
client.changedstate.acquire()
1293
client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
1294
client.changedstate.release()
1295
time2 = datetime.datetime.now()
1296
if (time2 - time) >= delay:
1297
if not client.approved_by_default:
1298
logger.warning("Client %s timed out while"
1299
" waiting for approval",
1300
client.name)
1301
if self.server.use_dbus:
1302
# Emit D-Bus signal
1303
client.Rejected("Approval timed out")
1304
return
1305
else:
1306
break
1307
else:
1308
delay -= time2 - time
1309
1310
sent_size = 0
1311
while sent_size < len(client.secret):
1312
try:
1313
sent = session.send(client.secret[sent_size:])
1314
except gnutls.errors.GNUTLSError as error:
1315
logger.warning("gnutls send failed")
1316
return
1317
logger.debug("Sent: %d, remaining: %d",
1318
sent, len(client.secret)
1319
- (sent_size + sent))
1320
sent_size += sent
1321
1322
logger.info("Sending secret to %s", client.name)
1323
# bump the timeout as if seen
1324
client.checked_ok()
1325
if self.server.use_dbus:
1326
# Emit D-Bus signal
1327
client.GotSecret()
1016
1328
1017
for c in self.server.clients:
1018
if c.fingerprint == fpr:
1019
client = c
1020
break
1021
else:
1022
ipc.write(u"NOTFOUND %s %s\n"
1023
% (fpr, unicode(self.client_address)))
1024
session.bye()
1025
return
1026
# Have to check if client.still_valid(), since it is
1027
# possible that the client timed out while establishing
1028
# the GnuTLS session.
1029
if not client.still_valid():
1030
ipc.write(u"INVALID %s\n" % client.name)
1031
session.bye()
1032
return
1033
ipc.write(u"SENDING %s\n" % client.name)
1034
sent_size = 0
1035
while sent_size < len(client.secret):
1036
sent = session.send(client.secret[sent_size:])
1037
logger.debug(u"Sent: %d, remaining: %d",
1038
sent, len(client.secret)
1039
- (sent_size + sent))
1040
sent_size += sent
1041
session.bye()
1329
finally:
1330
if approval_required:
1331
client.approvals_pending -= 1
1332
try:
1333
session.bye()
1334
except gnutls.errors.GNUTLSError as error:
1335
logger.warning("GnuTLS bye failed")
1042
1336
1043
1337
@staticmethod
1044
1338
def peer_certificate(session):
1054
1348
.gnutls_certificate_get_peers
1055
1349
(session._c_object, ctypes.byref(list_size)))
1056
1350
if not bool(cert_list) and list_size.value != 0:
1057
raise gnutls.errors.GNUTLSError(u"error getting peer"
1058
u" certificate")
1351
raise gnutls.errors.GNUTLSError("error getting peer"
1352
" certificate")
1059
1353
if list_size.value == 0:
1060
1354
return None
1061
1355
cert = cert_list[0]
1087
1381
if crtverify.value != 0:
1088
1382
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1089
1383
raise (gnutls.errors.CertificateSecurityError
1090
(u"Verify failed"))
1384
("Verify failed"))
1091
1385
# New buffer for the fingerprint
1092
1386
buf = ctypes.create_string_buffer(20)
1093
1387
buf_len = ctypes.c_size_t()
1100
1394
# Convert the buffer to a Python bytestring
1101
1395
fpr = ctypes.string_at(buf, buf_len.value)
1102
1396
# Convert the bytestring to hexadecimal notation
1103
hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
1397
hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
1104
1398
return hex_fpr
1105
1399
1106
1400
1107
class ForkingMixInWithPipe(socketserver.ForkingMixIn, object):
1108
"""Like socketserver.ForkingMixIn, but also pass a pipe."""
1401
class MultiprocessingMixIn(object):
1402
"""Like socketserver.ThreadingMixIn, but with multiprocessing"""
1403
def sub_process_main(self, request, address):
1404
try:
1405
self.finish_request(request, address)
1406
except:
1407
self.handle_error(request, address)
1408
self.close_request(request)
1409
1410
def process_request(self, request, address):
1411
"""Start a new process to process the request."""
1412
multiprocessing.Process(target = self.sub_process_main,
1413
args = (request, address)).start()
1414
1415
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1416
""" adds a pipe to the MixIn """
1109
1417
def process_request(self, request, client_address):
1110
1418
"""Overrides and wraps the original process_request().
1111
1419
1112
1420
This function creates a new pipe in self.pipe
1113
1421
"""
1114
self.pipe = os.pipe()
1115
super(ForkingMixInWithPipe,
1422
parent_pipe, self.child_pipe = multiprocessing.Pipe()
1423
1424
super(MultiprocessingMixInWithPipe,
1116
1425
self).process_request(request, client_address)
1117
os.close(self.pipe[1]) # close write end
1118
self.add_pipe(self.pipe[0])
1119
def add_pipe(self, pipe):
1426
self.child_pipe.close()
1427
self.add_pipe(parent_pipe)
1428
1429
def add_pipe(self, parent_pipe):
1120
1430
"""Dummy function; override as necessary"""
1121
os.close(pipe)
1122
1123
1124
class IPv6_TCPServer(ForkingMixInWithPipe,
1431
raise NotImplementedError
1432
1433
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1125
1434
socketserver.TCPServer, object):
1126
1435
"""IPv6-capable TCP server. Accepts 'None' as address and/or port
1127
1436
1143
1452
bind to an address or port if they were not specified."""
1144
1453
if self.interface is not None:
1145
1454
if SO_BINDTODEVICE is None:
1146
logger.error(u"SO_BINDTODEVICE does not exist;"
1147
u" cannot bind to interface %s",
1455
logger.error("SO_BINDTODEVICE does not exist;"
1456
" cannot bind to interface %s",
1148
1457
self.interface)
1149
1458
else:
1150
1459
try:
1151
1460
self.socket.setsockopt(socket.SOL_SOCKET,
1152
1461
SO_BINDTODEVICE,
1153
1462
str(self.interface
1154
+ u'\0'))
1155
except socket.error, error:
1463
+ '\0'))
1464
except socket.error as error:
1156
1465
if error[0] == errno.EPERM:
1157
logger.error(u"No permission to"
1158
u" bind to interface %s",
1466
logger.error("No permission to"
1467
" bind to interface %s",
1159
1468
self.interface)
1160
1469
elif error[0] == errno.ENOPROTOOPT:
1161
logger.error(u"SO_BINDTODEVICE not available;"
1162
u" cannot bind to interface %s",
1470
logger.error("SO_BINDTODEVICE not available;"
1471
" cannot bind to interface %s",
1163
1472
self.interface)
1164
1473
else:
1165
1474
raise
1167
1476
if self.server_address[0] or self.server_address[1]:
1168
1477
if not self.server_address[0]:
1169
1478
if self.address_family == socket.AF_INET6:
1170
any_address = u"::" # in6addr_any
1479
any_address = "::" # in6addr_any
1171
1480
else:
1172
1481
any_address = socket.INADDR_ANY
1173
1482
self.server_address = (any_address,
1212
1521
return socketserver.TCPServer.server_activate(self)
1213
1522
def enable(self):
1214
1523
self.enabled = True
1215
def add_pipe(self, pipe):
1524
def add_pipe(self, parent_pipe):
1216
1525
# Call "handle_ipc" for both data and EOF events
1217
gobject.io_add_watch(pipe, gobject.IO_IN | gobject.IO_HUP,
1218
self.handle_ipc)
1219
def handle_ipc(self, source, condition, file_objects={}):
1526
gobject.io_add_watch(parent_pipe.fileno(),
1527
gobject.IO_IN | gobject.IO_HUP,
1528
functools.partial(self.handle_ipc,
1529
parent_pipe = parent_pipe))
1530
1531
def handle_ipc(self, source, condition, parent_pipe=None,
1532
client_object=None):
1220
1533
condition_names = {
1221
gobject.IO_IN: u"IN", # There is data to read.
1222
gobject.IO_OUT: u"OUT", # Data can be written (without
1534
gobject.IO_IN: "IN", # There is data to read.
1535
gobject.IO_OUT: "OUT", # Data can be written (without
1223
1536
# blocking).
1224
gobject.IO_PRI: u"PRI", # There is urgent data to read.
1225
gobject.IO_ERR: u"ERR", # Error condition.
1226
gobject.IO_HUP: u"HUP" # Hung up (the connection has been
1537
gobject.IO_PRI: "PRI", # There is urgent data to read.
1538
gobject.IO_ERR: "ERR", # Error condition.
1539
gobject.IO_HUP: "HUP" # Hung up (the connection has been
1227
1540
# broken, usually for pipes and
1228
1541
# sockets).
1229
1542
}
1231
1544
for cond, name in
1232
1545
condition_names.iteritems()
1233
1546
if cond & condition)
1234
logger.debug(u"Handling IPC: FD = %d, condition = %s", source,
1235
conditions_string)
1236
1237
# Turn the pipe file descriptor into a Python file object
1238
if source not in file_objects:
1239
file_objects[source] = os.fdopen(source, u"r", 1)
1240
1241
# Read a line from the file object
1242
cmdline = file_objects[source].readline()
1243
if not cmdline: # Empty line means end of file
1244
# close the IPC pipe
1245
file_objects[source].close()
1246
del file_objects[source]
1247
1248
# Stop calling this function
1249
return False
1250
1251
logger.debug(u"IPC command: %r", cmdline)
1252
1253
# Parse and act on command
1254
cmd, args = cmdline.rstrip(u"\r\n").split(None, 1)
1255
1256
if cmd == u"NOTFOUND":
1257
logger.warning(u"Client not found for fingerprint: %s",
1258
args)
1259
if self.use_dbus:
1260
# Emit D-Bus signal
1261
mandos_dbus_service.ClientNotFound(args)
1262
elif cmd == u"INVALID":
1263
for client in self.clients:
1264
if client.name == args:
1265
logger.warning(u"Client %s is invalid", args)
1266
if self.use_dbus:
1267
# Emit D-Bus signal
1268
client.Rejected()
1269
break
1270
else:
1271
logger.error(u"Unknown client %s is invalid", args)
1272
elif cmd == u"SENDING":
1273
for client in self.clients:
1274
if client.name == args:
1275
logger.info(u"Sending secret to %s", client.name)
1276
client.checked_ok()
1277
if self.use_dbus:
1278
# Emit D-Bus signal
1279
client.ReceivedSecret()
1280
break
1281
else:
1282
logger.error(u"Sending secret to unknown client %s",
1283
args)
1284
else:
1285
logger.error(u"Unknown IPC command: %r", cmdline)
1286
1287
# Keep calling this function
1547
# error or the other end of multiprocessing.Pipe has closed
1548
if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
1549
return False
1550
1551
# Read a request from the child
1552
request = parent_pipe.recv()
1553
command = request[0]
1554
1555
if command == 'init':
1556
fpr = request[1]
1557
address = request[2]
1558
1559
for c in self.clients:
1560
if c.fingerprint == fpr:
1561
client = c
1562
break
1563
else:
1564
logger.warning("Client not found for fingerprint: %s, ad"
1565
"dress: %s", fpr, address)
1566
if self.use_dbus:
1567
# Emit D-Bus signal
1568
mandos_dbus_service.ClientNotFound(fpr, address[0])
1569
parent_pipe.send(False)
1570
return False
1571
1572
gobject.io_add_watch(parent_pipe.fileno(),
1573
gobject.IO_IN | gobject.IO_HUP,
1574
functools.partial(self.handle_ipc,
1575
parent_pipe = parent_pipe,
1576
client_object = client))
1577
parent_pipe.send(True)
1578
# remove the old hook in favor of the new above hook on same fileno
1579
return False
1580
if command == 'funcall':
1581
funcname = request[1]
1582
args = request[2]
1583
kwargs = request[3]
1584
1585
parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
1586
1587
if command == 'getattr':
1588
attrname = request[1]
1589
if callable(client_object.__getattribute__(attrname)):
1590
parent_pipe.send(('function',))
1591
else:
1592
parent_pipe.send(('data', client_object.__getattribute__(attrname)))
1593
1594
if command == 'setattr':
1595
attrname = request[1]
1596
value = request[2]
1597
setattr(client_object, attrname, value)
1598
1288
1599
return True
1289
1600
1290
1601
1291
1602
def string_to_delta(interval):
1292
1603
"""Parse a string and return a datetime.timedelta
1293
1604
1294
>>> string_to_delta(u'7d')
1605
>>> string_to_delta('7d')
1295
1606
datetime.timedelta(7)
1296
>>> string_to_delta(u'60s')
1607
>>> string_to_delta('60s')
1297
1608
datetime.timedelta(0, 60)
1298
>>> string_to_delta(u'60m')
1609
>>> string_to_delta('60m')
1299
1610
datetime.timedelta(0, 3600)
1300
>>> string_to_delta(u'24h')
1611
>>> string_to_delta('24h')
1301
1612
datetime.timedelta(1)
1302
>>> string_to_delta(u'1w')
1613
>>> string_to_delta('1w')
1303
1614
datetime.timedelta(7)
1304
>>> string_to_delta(u'5m 30s')
1615
>>> string_to_delta('5m 30s')
1305
1616
datetime.timedelta(0, 330)
1306
1617
"""
1307
1618
timevalue = datetime.timedelta(0)
1309
1620
try:
1310
1621
suffix = unicode(s[-1])
1311
1622
value = int(s[:-1])
1312
if suffix == u"d":
1623
if suffix == "d":
1313
1624
delta = datetime.timedelta(value)
1314
elif suffix == u"s":
1625
elif suffix == "s":
1315
1626
delta = datetime.timedelta(0, value)
1316
elif suffix == u"m":
1627
elif suffix == "m":
1317
1628
delta = datetime.timedelta(0, 0, 0, 0, value)
1318
elif suffix == u"h":
1629
elif suffix == "h":
1319
1630
delta = datetime.timedelta(0, 0, 0, 0, 0, value)
1320
elif suffix == u"w":
1631
elif suffix == "w":
1321
1632
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1322
1633
else:
1323
raise ValueError
1324
except (ValueError, IndexError):
1325
raise ValueError
1634
raise ValueError("Unknown suffix %r" % suffix)
1635
except (ValueError, IndexError) as e:
1636
raise ValueError(*(e.args))
1326
1637
timevalue += delta
1327
1638
return timevalue
1328
1639
1334
1645
global if_nametoindex
1335
1646
try:
1336
1647
if_nametoindex = (ctypes.cdll.LoadLibrary
1337
(ctypes.util.find_library(u"c"))
1648
(ctypes.util.find_library("c"))
1338
1649
.if_nametoindex)
1339
1650
except (OSError, AttributeError):
1340
logger.warning(u"Doing if_nametoindex the hard way")
1651
logger.warning("Doing if_nametoindex the hard way")
1341
1652
def if_nametoindex(interface):
1342
1653
"Get an interface index the hard way, i.e. using fcntl()"
1343
1654
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
1344
with closing(socket.socket()) as s:
1655
with contextlib.closing(socket.socket()) as s:
1345
1656
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1346
struct.pack(str(u"16s16x"),
1657
struct.pack(str("16s16x"),
1347
1658
interface))
1348
interface_index = struct.unpack(str(u"I"),
1659
interface_index = struct.unpack(str("I"),
1349
1660
ifreq[16:20])[0]
1350
1661
return interface_index
1351
1662
return if_nametoindex(interface)
1359
1670
sys.exit()
1360
1671
os.setsid()
1361
1672
if not nochdir:
1362
os.chdir(u"/")
1673
os.chdir("/")
1363
1674
if os.fork():
1364
1675
sys.exit()
1365
1676
if not noclose:
1367
1678
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1368
1679
if not stat.S_ISCHR(os.fstat(null).st_mode):
1369
1680
raise OSError(errno.ENODEV,
1370
u"/dev/null not a character device")
1681
"%s not a character device"
1682
% os.path.devnull)
1371
1683
os.dup2(null, sys.stdin.fileno())
1372
1684
os.dup2(null, sys.stdout.fileno())
1373
1685
os.dup2(null, sys.stderr.fileno())
1380
1692
##################################################################
1381
1693
# Parsing of options, both command line and config file
1382
1694
1383
parser = optparse.OptionParser(version = "%%prog %s" % version)
1384
parser.add_option("-i", u"--interface", type=u"string",
1385
metavar="IF", help=u"Bind to interface IF")
1386
parser.add_option("-a", u"--address", type=u"string",
1387
help=u"Address to listen for requests on")
1388
parser.add_option("-p", u"--port", type=u"int",
1389
help=u"Port number to receive requests on")
1390
parser.add_option("--check", action=u"store_true",
1391
help=u"Run self-test")
1392
parser.add_option("--debug", action=u"store_true",
1393
help=u"Debug mode; run in foreground and log to"
1394
u" terminal")
1395
parser.add_option("--priority", type=u"string", help=u"GnuTLS"
1396
u" priority string (see GnuTLS documentation)")
1397
parser.add_option("--servicename", type=u"string",
1398
metavar=u"NAME", help=u"Zeroconf service name")
1399
parser.add_option("--configdir", type=u"string",
1400
default=u"/etc/mandos", metavar=u"DIR",
1401
help=u"Directory to search for configuration"
1402
u" files")
1403
parser.add_option("--no-dbus", action=u"store_false",
1404
dest=u"use_dbus", help=u"Do not provide D-Bus"
1405
u" system bus interface")
1406
parser.add_option("--no-ipv6", action=u"store_false",
1407
dest=u"use_ipv6", help=u"Do not use IPv6")
1408
options = parser.parse_args()[0]
1695
parser = argparse.ArgumentParser()
1696
parser.add_argument("-v", "--version", action="version",
1697
version = "%%(prog)s %s" % version,
1698
help="show version number and exit")
1699
parser.add_argument("-i", "--interface", metavar="IF",
1700
help="Bind to interface IF")
1701
parser.add_argument("-a", "--address",
1702
help="Address to listen for requests on")
1703
parser.add_argument("-p", "--port", type=int,
1704
help="Port number to receive requests on")
1705
parser.add_argument("--check", action="store_true",
1706
help="Run self-test")
1707
parser.add_argument("--debug", action="store_true",
1708
help="Debug mode; run in foreground and log"
1709
" to terminal")
1710
parser.add_argument("--debuglevel", metavar="LEVEL",
1711
help="Debug level for stdout output")
1712
parser.add_argument("--priority", help="GnuTLS"
1713
" priority string (see GnuTLS documentation)")
1714
parser.add_argument("--servicename",
1715
metavar="NAME", help="Zeroconf service name")
1716
parser.add_argument("--configdir",
1717
default="/etc/mandos", metavar="DIR",
1718
help="Directory to search for configuration"
1719
" files")
1720
parser.add_argument("--no-dbus", action="store_false",
1721
dest="use_dbus", help="Do not provide D-Bus"
1722
" system bus interface")
1723
parser.add_argument("--no-ipv6", action="store_false",
1724
dest="use_ipv6", help="Do not use IPv6")
1725
options = parser.parse_args()
1409
1726
1410
1727
if options.check:
1411
1728
import doctest
1413
1730
sys.exit()
1414
1731
1415
1732
# Default values for config file for server-global settings
1416
server_defaults = { u"interface": u"",
1417
u"address": u"",
1418
u"port": u"",
1419
u"debug": u"False",
1420
u"priority":
1421
u"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1422
u"servicename": u"Mandos",
1423
u"use_dbus": u"True",
1424
u"use_ipv6": u"True",
1733
server_defaults = { "interface": "",
1734
"address": "",
1735
"port": "",
1736
"debug": "False",
1737
"priority":
1738
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1739
"servicename": "Mandos",
1740
"use_dbus": "True",
1741
"use_ipv6": "True",
1742
"debuglevel": "",
1425
1743
}
1426
1744
1427
1745
# Parse config file for server-global settings
1428
1746
server_config = configparser.SafeConfigParser(server_defaults)
1429
1747
del server_defaults
1430
1748
server_config.read(os.path.join(options.configdir,
1431
u"mandos.conf"))
1749
"mandos.conf"))
1432
1750
# Convert the SafeConfigParser object to a dict
1433
1751
server_settings = server_config.defaults()
1434
1752
# Use the appropriate methods on the non-string config options
1435
for option in (u"debug", u"use_dbus", u"use_ipv6"):
1436
server_settings[option] = server_config.getboolean(u"DEFAULT",
1753
for option in ("debug", "use_dbus", "use_ipv6"):
1754
server_settings[option] = server_config.getboolean("DEFAULT",
1437
1755
option)
1438
1756
if server_settings["port"]:
1439
server_settings["port"] = server_config.getint(u"DEFAULT",
1440
u"port")
1757
server_settings["port"] = server_config.getint("DEFAULT",
1758
"port")
1441
1759
del server_config
1442
1760
1443
1761
# Override the settings from the config file with command line
1444
1762
# options, if set.
1445
for option in (u"interface", u"address", u"port", u"debug",
1446
u"priority", u"servicename", u"configdir",
1447
u"use_dbus", u"use_ipv6"):
1763
for option in ("interface", "address", "port", "debug",
1764
"priority", "servicename", "configdir",
1765
"use_dbus", "use_ipv6", "debuglevel"):
1448
1766
value = getattr(options, option)
1449
1767
if value is not None:
1450
1768
server_settings[option] = value
1458
1776
##################################################################
1459
1777
1460
1778
# For convenience
1461
debug = server_settings[u"debug"]
1462
use_dbus = server_settings[u"use_dbus"]
1463
use_ipv6 = server_settings[u"use_ipv6"]
1464
1465
if not debug:
1466
syslogger.setLevel(logging.WARNING)
1467
console.setLevel(logging.WARNING)
1468
1469
if server_settings[u"servicename"] != u"Mandos":
1779
debug = server_settings["debug"]
1780
debuglevel = server_settings["debuglevel"]
1781
use_dbus = server_settings["use_dbus"]
1782
use_ipv6 = server_settings["use_ipv6"]
1783
1784
if server_settings["servicename"] != "Mandos":
1470
1785
syslogger.setFormatter(logging.Formatter
1471
(u'Mandos (%s) [%%(process)d]:'
1472
u' %%(levelname)s: %%(message)s'
1473
% server_settings[u"servicename"]))
1786
('Mandos (%s) [%%(process)d]:'
1787
' %%(levelname)s: %%(message)s'
1788
% server_settings["servicename"]))
1474
1789
1475
1790
# Parse config file with clients
1476
client_defaults = { u"timeout": u"1h",
1477
u"interval": u"5m",
1478
u"checker": u"fping -q -- %%(host)s",
1479
u"host": u"",
1791
client_defaults = { "timeout": "1h",
1792
"interval": "5m",
1793
"checker": "fping -q -- %%(host)s",
1794
"host": "",
1795
"approval_delay": "0s",
1796
"approval_duration": "1s",
1480
1797
}
1481
1798
client_config = configparser.SafeConfigParser(client_defaults)
1482
client_config.read(os.path.join(server_settings[u"configdir"],
1483
u"clients.conf"))
1799
client_config.read(os.path.join(server_settings["configdir"],
1800
"clients.conf"))
1484
1801
1485
1802
global mandos_dbus_service
1486
1803
mandos_dbus_service = None
1487
1804
1488
tcp_server = MandosServer((server_settings[u"address"],
1489
server_settings[u"port"]),
1805
tcp_server = MandosServer((server_settings["address"],
1806
server_settings["port"]),
1490
1807
ClientHandler,
1491
interface=server_settings[u"interface"],
1808
interface=(server_settings["interface"]
1809
or None),
1492
1810
use_ipv6=use_ipv6,
1493
1811
gnutls_priority=
1494
server_settings[u"priority"],
1812
server_settings["priority"],
1495
1813
use_dbus=use_dbus)
1496
pidfilename = u"/var/run/mandos.pid"
1497
try:
1498
pidfile = open(pidfilename, u"w")
1499
except IOError:
1500
logger.error(u"Could not open file %r", pidfilename)
1814
if not debug:
1815
pidfilename = "/var/run/mandos.pid"
1816
try:
1817
pidfile = open(pidfilename, "w")
1818
except IOError:
1819
logger.error("Could not open file %r", pidfilename)
1501
1820
1502
1821
try:
1503
uid = pwd.getpwnam(u"_mandos").pw_uid
1504
gid = pwd.getpwnam(u"_mandos").pw_gid
1822
uid = pwd.getpwnam("_mandos").pw_uid
1823
gid = pwd.getpwnam("_mandos").pw_gid
1505
1824
except KeyError:
1506
1825
try:
1507
uid = pwd.getpwnam(u"mandos").pw_uid
1508
gid = pwd.getpwnam(u"mandos").pw_gid
1826
uid = pwd.getpwnam("mandos").pw_uid
1827
gid = pwd.getpwnam("mandos").pw_gid
1509
1828
except KeyError:
1510
1829
try:
1511
uid = pwd.getpwnam(u"nobody").pw_uid
1512
gid = pwd.getpwnam(u"nobody").pw_gid
1830
uid = pwd.getpwnam("nobody").pw_uid
1831
gid = pwd.getpwnam("nobody").pw_gid
1513
1832
except KeyError:
1514
1833
uid = 65534
1515
1834
gid = 65534
1516
1835
try:
1517
1836
os.setgid(gid)
1518
1837
os.setuid(uid)
1519
except OSError, error:
1838
except OSError as error:
1520
1839
if error[0] != errno.EPERM:
1521
1840
raise error
1522
1841
1523
# Enable all possible GnuTLS debugging
1842
if not debug and not debuglevel:
1843
syslogger.setLevel(logging.WARNING)
1844
console.setLevel(logging.WARNING)
1845
if debuglevel:
1846
level = getattr(logging, debuglevel.upper())
1847
syslogger.setLevel(level)
1848
console.setLevel(level)
1849
1524
1850
if debug:
1851
# Enable all possible GnuTLS debugging
1852
1525
1853
# "Use a log level over 10 to enable all debugging options."
1526
1854
# - GnuTLS manual
1527
1855
gnutls.library.functions.gnutls_global_set_log_level(11)
1528
1856
1529
1857
@gnutls.library.types.gnutls_log_func
1530
1858
def debug_gnutls(level, string):
1531
logger.debug(u"GnuTLS: %s", string[:-1])
1859
logger.debug("GnuTLS: %s", string[:-1])
1532
1860
1533
1861
(gnutls.library.functions
1534
1862
.gnutls_global_set_log_function(debug_gnutls))
1863
1864
# Redirect stdin so all checkers get /dev/null
1865
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1866
os.dup2(null, sys.stdin.fileno())
1867
if null > 2:
1868
os.close(null)
1869
else:
1870
# No console logging
1871
logger.removeHandler(console)
1872
1873
# Need to fork before connecting to D-Bus
1874
if not debug:
1875
# Close all input and output, do double fork, etc.
1876
daemon()
1535
1877
1536
1878
global main_loop
1537
1879
# From the Avahi example code
1540
1882
bus = dbus.SystemBus()
1541
1883
# End of Avahi example code
1542
1884
if use_dbus:
1543
bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos", bus)
1885
try:
1886
bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
1887
bus, do_not_queue=True)
1888
except dbus.exceptions.NameExistsException as e:
1889
logger.error(unicode(e) + ", disabling D-Bus")
1890
use_dbus = False
1891
server_settings["use_dbus"] = False
1892
tcp_server.use_dbus = False
1544
1893
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1545
service = AvahiService(name = server_settings[u"servicename"],
1546
servicetype = u"_mandos._tcp",
1894
service = AvahiService(name = server_settings["servicename"],
1895
servicetype = "_mandos._tcp",
1547
1896
protocol = protocol, bus = bus)
1548
1897
if server_settings["interface"]:
1549
1898
service.interface = (if_nametoindex
1550
(str(server_settings[u"interface"])))
1899
(str(server_settings["interface"])))
1900
1901
global multiprocessing_manager
1902
multiprocessing_manager = multiprocessing.Manager()
1551
1903
1552
1904
client_class = Client
1553
1905
if use_dbus:
1554
1906
client_class = functools.partial(ClientDBus, bus = bus)
1907
def client_config_items(config, section):
1908
special_settings = {
1909
"approved_by_default":
1910
lambda: config.getboolean(section,
1911
"approved_by_default"),
1912
}
1913
for name, value in config.items(section):
1914
try:
1915
yield (name, special_settings[name]())
1916
except KeyError:
1917
yield (name, value)
1918
1555
1919
tcp_server.clients.update(set(
1556
1920
client_class(name = section,
1557
config= dict(client_config.items(section)))
1921
config= dict(client_config_items(
1922
client_config, section)))
1558
1923
for section in client_config.sections()))
1559
1924
if not tcp_server.clients:
1560
logger.warning(u"No clients defined")
1561
1562
if debug:
1563
# Redirect stdin so all checkers get /dev/null
1564
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1565
os.dup2(null, sys.stdin.fileno())
1566
if null > 2:
1567
os.close(null)
1568
else:
1569
# No console logging
1570
logger.removeHandler(console)
1571
# Close all input and output, do double fork, etc.
1572
daemon()
1573
1574
try:
1575
with closing(pidfile):
1576
pid = os.getpid()
1577
pidfile.write(str(pid) + "\n")
1578
del pidfile
1579
except IOError:
1580
logger.error(u"Could not write to file %r with PID %d",
1581
pidfilename, pid)
1582
except NameError:
1583
# "pidfile" was never created
1584
pass
1585
del pidfilename
1586
1587
def cleanup():
1588
"Cleanup function; run on exit"
1589
service.cleanup()
1925
logger.warning("No clients defined")
1590
1926
1591
while tcp_server.clients:
1592
client = tcp_server.clients.pop()
1593
client.disable_hook = None
1594
client.disable()
1595
1596
atexit.register(cleanup)
1597
1598
1927
if not debug:
1928
try:
1929
with pidfile:
1930
pid = os.getpid()
1931
pidfile.write(str(pid) + "\n".encode("utf-8"))
1932
del pidfile
1933
except IOError:
1934
logger.error("Could not write to file %r with PID %d",
1935
pidfilename, pid)
1936
except NameError:
1937
# "pidfile" was never created
1938
pass
1939
del pidfilename
1940
1599
1941
signal.signal(signal.SIGINT, signal.SIG_IGN)
1942
1600
1943
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1601
1944
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
1602
1945
1604
1947
class MandosDBusService(dbus.service.Object):
1605
1948
"""A D-Bus proxy object"""
1606
1949
def __init__(self):
1607
dbus.service.Object.__init__(self, bus, u"/")
1608
_interface = u"se.bsnet.fukt.Mandos"
1609
1610
@dbus.service.signal(_interface, signature=u"oa{sv}")
1611
def ClientAdded(self, objpath, properties):
1612
"D-Bus signal"
1613
pass
1614
1615
@dbus.service.signal(_interface, signature=u"s")
1616
def ClientNotFound(self, fingerprint):
1617
"D-Bus signal"
1618
pass
1619
1620
@dbus.service.signal(_interface, signature=u"os")
1950
dbus.service.Object.__init__(self, bus, "/")
1951
_interface = "se.bsnet.fukt.Mandos"
1952
1953
@dbus.service.signal(_interface, signature="o")
1954
def ClientAdded(self, objpath):
1955
"D-Bus signal"
1956
pass
1957
1958
@dbus.service.signal(_interface, signature="ss")
1959
def ClientNotFound(self, fingerprint, address):
1960
"D-Bus signal"
1961
pass
1962
1963
@dbus.service.signal(_interface, signature="os")
1621
1964
def ClientRemoved(self, objpath, name):
1622
1965
"D-Bus signal"
1623
1966
pass
1624
1967
1625
@dbus.service.method(_interface, out_signature=u"ao")
1968
@dbus.service.method(_interface, out_signature="ao")
1626
1969
def GetAllClients(self):
1627
1970
"D-Bus method"
1628
1971
return dbus.Array(c.dbus_object_path
1629
1972
for c in tcp_server.clients)
1630
1973
1631
1974
@dbus.service.method(_interface,
1632
out_signature=u"a{oa{sv}}")
1975
out_signature="a{oa{sv}}")
1633
1976
def GetAllClientsWithProperties(self):
1634
1977
"D-Bus method"
1635
1978
return dbus.Dictionary(
1636
((c.dbus_object_path, c.GetAll(u""))
1979
((c.dbus_object_path, c.GetAll(""))
1637
1980
for c in tcp_server.clients),
1638
signature=u"oa{sv}")
1981
signature="oa{sv}")
1639
1982
1640
@dbus.service.method(_interface, in_signature=u"o")
1983
@dbus.service.method(_interface, in_signature="o")
1641
1984
def RemoveClient(self, object_path):
1642
1985
"D-Bus method"
1643
1986
for c in tcp_server.clients:
1645
1988
tcp_server.clients.remove(c)
1646
1989
c.remove_from_connection()
1647
1990
# Don't signal anything except ClientRemoved
1648
c.disable(signal=False)
1991
c.disable(quiet=True)
1649
1992
# Emit D-Bus signal
1650
1993
self.ClientRemoved(object_path, c.name)
1651
1994
return
1652
raise KeyError
1995
raise KeyError(object_path)
1653
1996
1654
1997
del _interface
1655
1998
1656
1999
mandos_dbus_service = MandosDBusService()
1657
2000
2001
def cleanup():
2002
"Cleanup function; run on exit"
2003
service.cleanup()
2004
2005
while tcp_server.clients:
2006
client = tcp_server.clients.pop()
2007
if use_dbus:
2008
client.remove_from_connection()
2009
client.disable_hook = None
2010
# Don't signal anything except ClientRemoved
2011
client.disable(quiet=True)
2012
if use_dbus:
2013
# Emit D-Bus signal
2014
mandos_dbus_service.ClientRemoved(client.dbus_object_path,
2015
client.name)
2016
2017
atexit.register(cleanup)
2018
1658
2019
for client in tcp_server.clients:
1659
2020
if use_dbus:
1660
2021
# Emit D-Bus signal
1661
mandos_dbus_service.ClientAdded(client.dbus_object_path,
1662
client.GetAll(u""))
2022
mandos_dbus_service.ClientAdded(client.dbus_object_path)
1663
2023
client.enable()
1664
2024
1665
2025
tcp_server.enable()
1668
2028
# Find out what port we got
1669
2029
service.port = tcp_server.socket.getsockname()[1]
1670
2030
if use_ipv6:
1671
logger.info(u"Now listening on address %r, port %d,"
2031
logger.info("Now listening on address %r, port %d,"
1672
2032
" flowinfo %d, scope_id %d"
1673
2033
% tcp_server.socket.getsockname())
1674
2034
else: # IPv4
1675
logger.info(u"Now listening on address %r, port %d"
2035
logger.info("Now listening on address %r, port %d"
1676
2036
% tcp_server.socket.getsockname())
1677
2037
1678
2038
#service.interface = tcp_server.socket.getsockname()[3]
1681
2041
# From the Avahi example code
1682
2042
try:
1683
2043
service.activate()
1684
except dbus.exceptions.DBusException, error:
1685
logger.critical(u"DBusException: %s", error)
2044
except dbus.exceptions.DBusException as error:
2045
logger.critical("DBusException: %s", error)
2046
cleanup()
1686
2047
sys.exit(1)
1687
2048
# End of Avahi example code
1688
2049
1691
2052
(tcp_server.handle_request
1692
2053
(*args[2:], **kwargs) or True))
1693
2054
1694
logger.debug(u"Starting main loop")
2055
logger.debug("Starting main loop")
1695
2056
main_loop.run()
1696
except AvahiError, error:
1697
logger.critical(u"AvahiError: %s", error)
2057
except AvahiError as error:
2058
logger.critical("AvahiError: %s", error)
2059
cleanup()
1698
2060
sys.exit(1)
1699
2061
except KeyboardInterrupt:
1700
2062
if debug:
1701
print >> sys.stderr
1702
logger.debug(u"Server received KeyboardInterrupt")
1703
logger.debug(u"Server exiting")
2063
print("", file=sys.stderr)
2064
logger.debug("Server received KeyboardInterrupt")
2065
logger.debug("Server exiting")
2066
# Must run before the D-Bus bus name gets deregistered
2067
cleanup()
1704
2068
1705
2069
if __name__ == '__main__':
1706
2070
main()
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0