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