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