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