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