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 466
- compare with another revision
- download diff
- download tarball
- view history from revision 466
- Committer: Teddy Hogeborn
- Date: 2011-02-27 17:26:35 UTC
- Revision ID: teddy@fukt.bsnet.se-20110227172635-hw1sire7k3vuo1co
Update copyright year to "2011" wherever appropriate.
- files modified:
- DBUS-API
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-2011 Teddy Hogeborn
15
# Copyright © 2008-2011 Björn Påhlsson
16
16
#
17
17
# This program is free software: you can redistribute it and/or modify
18
18
# it under the terms of the GNU General Public License as published by
31
31
# Contact the authors at <mandos@fukt.bsnet.se>.
32
32
#
33
33
34
from __future__ import division, with_statement, absolute_import
34
from __future__ import (division, absolute_import, print_function,
35
unicode_literals)
35
36
36
37
import SocketServer as socketserver
37
38
import socket
81
82
SO_BINDTODEVICE = None
82
83
83
84
84
version = "1.2"
85
version = "1.2.3"
85
86
86
#logger = logging.getLogger(u'mandos')
87
logger = logging.Logger(u'mandos')
87
#logger = logging.getLogger('mandos')
88
logger = logging.Logger('mandos')
88
89
syslogger = (logging.handlers.SysLogHandler
89
90
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
90
address = "/dev/log"))
91
address = str("/dev/log")))
91
92
syslogger.setFormatter(logging.Formatter
92
(u'Mandos [%(process)d]: %(levelname)s:'
93
u' %(message)s'))
93
('Mandos [%(process)d]: %(levelname)s:'
94
' %(message)s'))
94
95
logger.addHandler(syslogger)
95
96
96
97
console = logging.StreamHandler()
97
console.setFormatter(logging.Formatter(u'%(name)s [%(process)d]:'
98
u' %(levelname)s:'
99
u' %(message)s'))
98
console.setFormatter(logging.Formatter('%(name)s [%(process)d]:'
99
' %(levelname)s:'
100
' %(message)s'))
100
101
logger.addHandler(console)
101
102
102
103
class AvahiError(Exception):
119
120
Attributes:
120
121
interface: integer; avahi.IF_UNSPEC or an interface index.
121
122
Used to optionally bind to the specified interface.
122
name: string; Example: u'Mandos'
123
type: string; Example: u'_mandos._tcp'.
123
name: string; Example: 'Mandos'
124
type: string; Example: '_mandos._tcp'.
124
125
See <http://www.dns-sd.org/ServiceTypes.html>
125
126
port: integer; what port to announce
126
127
TXT: list of strings; TXT record for the service
135
136
"""
136
137
def __init__(self, interface = avahi.IF_UNSPEC, name = None,
137
138
servicetype = None, port = None, TXT = None,
138
domain = u"", host = u"", max_renames = 32768,
139
domain = "", host = "", max_renames = 32768,
139
140
protocol = avahi.PROTO_UNSPEC, bus = None):
140
141
self.interface = interface
141
142
self.name = name
153
154
def rename(self):
154
155
"""Derived from the Avahi example code"""
155
156
if self.rename_count >= self.max_renames:
156
logger.critical(u"No suitable Zeroconf service name found"
157
u" after %i retries, exiting.",
157
logger.critical("No suitable Zeroconf service name found"
158
" after %i retries, exiting.",
158
159
self.rename_count)
159
raise AvahiServiceError(u"Too many renames")
160
raise AvahiServiceError("Too many renames")
160
161
self.name = unicode(self.server.GetAlternativeServiceName(self.name))
161
logger.info(u"Changing Zeroconf service name to %r ...",
162
logger.info("Changing Zeroconf service name to %r ...",
162
163
self.name)
163
164
syslogger.setFormatter(logging.Formatter
164
(u'Mandos (%s) [%%(process)d]:'
165
u' %%(levelname)s: %%(message)s'
165
('Mandos (%s) [%%(process)d]:'
166
' %%(levelname)s: %%(message)s'
166
167
% self.name))
167
168
self.remove()
168
169
try:
169
170
self.add()
170
171
except dbus.exceptions.DBusException, error:
171
logger.critical(u"DBusException: %s", error)
172
logger.critical("DBusException: %s", error)
172
173
self.cleanup()
173
174
os._exit(1)
174
175
self.rename_count += 1
186
187
self.group.connect_to_signal('StateChanged',
187
188
self
188
189
.entry_group_state_changed)
189
logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
190
logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
190
191
self.name, self.type)
191
192
self.group.AddService(
192
193
self.interface,
199
200
self.group.Commit()
200
201
def entry_group_state_changed(self, state, error):
201
202
"""Derived from the Avahi example code"""
202
logger.debug(u"Avahi entry group state change: %i", state)
203
logger.debug("Avahi entry group state change: %i", state)
203
204
204
205
if state == avahi.ENTRY_GROUP_ESTABLISHED:
205
logger.debug(u"Zeroconf service established.")
206
logger.debug("Zeroconf service established.")
206
207
elif state == avahi.ENTRY_GROUP_COLLISION:
207
logger.warning(u"Zeroconf service name collision.")
208
logger.info("Zeroconf service name collision.")
208
209
self.rename()
209
210
elif state == avahi.ENTRY_GROUP_FAILURE:
210
logger.critical(u"Avahi: Error in group state changed %s",
211
logger.critical("Avahi: Error in group state changed %s",
211
212
unicode(error))
212
raise AvahiGroupError(u"State changed: %s"
213
raise AvahiGroupError("State changed: %s"
213
214
% unicode(error))
214
215
def cleanup(self):
215
216
"""Derived from the Avahi example code"""
218
219
self.group = None
219
220
def server_state_changed(self, state):
220
221
"""Derived from the Avahi example code"""
221
logger.debug(u"Avahi server state change: %i", state)
222
logger.debug("Avahi server state change: %i", state)
222
223
if state == avahi.SERVER_COLLISION:
223
logger.error(u"Zeroconf server name collision")
224
logger.error("Zeroconf server name collision")
224
225
self.remove()
225
226
elif state == avahi.SERVER_RUNNING:
226
227
self.add()
231
232
self.bus.get_object(avahi.DBUS_NAME,
232
233
avahi.DBUS_PATH_SERVER),
233
234
avahi.DBUS_INTERFACE_SERVER)
234
self.server.connect_to_signal(u"StateChanged",
235
self.server.connect_to_signal("StateChanged",
235
236
self.server_state_changed)
236
237
self.server_state_changed(self.server.GetState())
237
238
272
273
runtime_expansions: Allowed attributes for runtime expansion.
273
274
"""
274
275
275
runtime_expansions = (u"approval_delay", u"approval_duration",
276
u"created", u"enabled", u"fingerprint",
277
u"host", u"interval", u"last_checked_ok",
278
u"last_enabled", u"name", u"timeout")
276
runtime_expansions = ("approval_delay", "approval_duration",
277
"created", "enabled", "fingerprint",
278
"host", "interval", "last_checked_ok",
279
"last_enabled", "name", "timeout")
279
280
280
281
@staticmethod
281
282
def _timedelta_to_milliseconds(td):
302
303
self.name = name
303
304
if config is None:
304
305
config = {}
305
logger.debug(u"Creating client %r", self.name)
306
logger.debug("Creating client %r", self.name)
306
307
# Uppercase and remove spaces from fingerprint for later
307
308
# comparison purposes with return value from the fingerprint()
308
309
# function
309
self.fingerprint = (config[u"fingerprint"].upper()
310
.replace(u" ", u""))
311
logger.debug(u" Fingerprint: %s", self.fingerprint)
312
if u"secret" in config:
313
self.secret = config[u"secret"].decode(u"base64")
314
elif u"secfile" in config:
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:
315
316
with open(os.path.expanduser(os.path.expandvars
316
(config[u"secfile"])),
317
(config["secfile"])),
317
318
"rb") as secfile:
318
319
self.secret = secfile.read()
319
320
else:
320
raise TypeError(u"No secret or secfile for client %s"
321
raise TypeError("No secret or secfile for client %s"
321
322
% self.name)
322
self.host = config.get(u"host", u"")
323
self.host = config.get("host", "")
323
324
self.created = datetime.datetime.utcnow()
324
325
self.enabled = False
325
326
self.last_approval_request = None
326
327
self.last_enabled = None
327
328
self.last_checked_ok = None
328
self.timeout = string_to_delta(config[u"timeout"])
329
self.interval = string_to_delta(config[u"interval"])
329
self.timeout = string_to_delta(config["timeout"])
330
self.interval = string_to_delta(config["interval"])
330
331
self.disable_hook = disable_hook
331
332
self.checker = None
332
333
self.checker_initiator_tag = None
333
334
self.disable_initiator_tag = None
334
335
self.checker_callback_tag = None
335
self.checker_command = config[u"checker"]
336
self.checker_command = config["checker"]
336
337
self.current_checker_command = None
337
338
self.last_connect = None
338
339
self._approved = None
339
self.approved_by_default = config.get(u"approved_by_default",
340
self.approved_by_default = config.get("approved_by_default",
340
341
True)
341
342
self.approvals_pending = 0
342
343
self.approval_delay = string_to_delta(
343
config[u"approval_delay"])
344
config["approval_delay"])
344
345
self.approval_duration = string_to_delta(
345
config[u"approval_duration"])
346
config["approval_duration"])
346
347
self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
347
348
348
349
def send_changedstate(self):
352
353
353
354
def enable(self):
354
355
"""Start this client's checker and timeout hooks"""
355
if getattr(self, u"enabled", False):
356
if getattr(self, "enabled", False):
356
357
# Already enabled
357
358
return
358
359
self.send_changedstate()
377
378
if not quiet:
378
379
self.send_changedstate()
379
380
if not quiet:
380
logger.info(u"Disabling client %s", self.name)
381
if getattr(self, u"disable_initiator_tag", False):
381
logger.info("Disabling client %s", self.name)
382
if getattr(self, "disable_initiator_tag", False):
382
383
gobject.source_remove(self.disable_initiator_tag)
383
384
self.disable_initiator_tag = None
384
if getattr(self, u"checker_initiator_tag", False):
385
if getattr(self, "checker_initiator_tag", False):
385
386
gobject.source_remove(self.checker_initiator_tag)
386
387
self.checker_initiator_tag = None
387
388
self.stop_checker()
402
403
if os.WIFEXITED(condition):
403
404
exitstatus = os.WEXITSTATUS(condition)
404
405
if exitstatus == 0:
405
logger.info(u"Checker for %(name)s succeeded",
406
logger.info("Checker for %(name)s succeeded",
406
407
vars(self))
407
408
self.checked_ok()
408
409
else:
409
logger.info(u"Checker for %(name)s failed",
410
logger.info("Checker for %(name)s failed",
410
411
vars(self))
411
412
else:
412
logger.warning(u"Checker for %(name)s crashed?",
413
logger.warning("Checker for %(name)s crashed?",
413
414
vars(self))
414
415
415
416
def checked_ok(self):
450
451
raise error
451
452
else:
452
453
if pid:
453
logger.warning(u"Checker was a zombie")
454
logger.warning("Checker was a zombie")
454
455
gobject.source_remove(self.checker_callback_tag)
455
456
self.checker_callback(pid, status,
456
457
self.current_checker_command)
463
464
# Escape attributes for the shell
464
465
escaped_attrs = dict(
465
466
(attr,
466
re.escape(unicode(str(getattr(self, attr, u"")),
467
re.escape(unicode(str(getattr(self, attr, "")),
467
468
errors=
468
u'replace')))
469
'replace')))
469
470
for attr in
470
471
self.runtime_expansions)
471
472
472
473
try:
473
474
command = self.checker_command % escaped_attrs
474
475
except TypeError, error:
475
logger.error(u'Could not format string "%s":'
476
u' %s', self.checker_command, error)
476
logger.error('Could not format string "%s":'
477
' %s', self.checker_command, error)
477
478
return True # Try again later
478
479
self.current_checker_command = command
479
480
try:
480
logger.info(u"Starting checker %r for %s",
481
logger.info("Starting checker %r for %s",
481
482
command, self.name)
482
483
# We don't need to redirect stdout and stderr, since
483
484
# in normal mode, that is already done by daemon(),
485
486
# always replaced by /dev/null.)
486
487
self.checker = subprocess.Popen(command,
487
488
close_fds=True,
488
shell=True, cwd=u"/")
489
shell=True, cwd="/")
489
490
self.checker_callback_tag = (gobject.child_watch_add
490
491
(self.checker.pid,
491
492
self.checker_callback,
497
498
gobject.source_remove(self.checker_callback_tag)
498
499
self.checker_callback(pid, status, command)
499
500
except OSError, error:
500
logger.error(u"Failed to start subprocess: %s",
501
logger.error("Failed to start subprocess: %s",
501
502
error)
502
503
# Re-run this periodically if run by gobject.timeout_add
503
504
return True
507
508
if self.checker_callback_tag:
508
509
gobject.source_remove(self.checker_callback_tag)
509
510
self.checker_callback_tag = None
510
if getattr(self, u"checker", None) is None:
511
if getattr(self, "checker", None) is None:
511
512
return
512
logger.debug(u"Stopping checker for %(name)s", vars(self))
513
logger.debug("Stopping checker for %(name)s", vars(self))
513
514
try:
514
515
os.kill(self.checker.pid, signal.SIGTERM)
515
516
#time.sleep(0.5)
520
521
raise
521
522
self.checker = None
522
523
523
def dbus_service_property(dbus_interface, signature=u"v",
524
access=u"readwrite", byte_arrays=False):
524
def dbus_service_property(dbus_interface, signature="v",
525
access="readwrite", byte_arrays=False):
525
526
"""Decorators for marking methods of a DBusObjectWithProperties to
526
527
become properties on the D-Bus.
527
528
534
535
"""
535
536
# Encoding deeply encoded byte arrays is not supported yet by the
536
537
# "Set" method, so we fail early here:
537
if byte_arrays and signature != u"ay":
538
raise ValueError(u"Byte arrays not supported for non-'ay'"
539
u" signature %r" % signature)
538
if byte_arrays and signature != "ay":
539
raise ValueError("Byte arrays not supported for non-'ay'"
540
" signature %r" % signature)
540
541
def decorator(func):
541
542
func._dbus_is_property = True
542
543
func._dbus_interface = dbus_interface
543
544
func._dbus_signature = signature
544
545
func._dbus_access = access
545
546
func._dbus_name = func.__name__
546
if func._dbus_name.endswith(u"_dbus_property"):
547
if func._dbus_name.endswith("_dbus_property"):
547
548
func._dbus_name = func._dbus_name[:-14]
548
func._dbus_get_args_options = {u'byte_arrays': byte_arrays }
549
func._dbus_get_args_options = {'byte_arrays': byte_arrays }
549
550
return func
550
551
return decorator
551
552
579
580
580
581
@staticmethod
581
582
def _is_dbus_property(obj):
582
return getattr(obj, u"_dbus_is_property", False)
583
return getattr(obj, "_dbus_is_property", False)
583
584
584
585
def _get_all_dbus_properties(self):
585
586
"""Returns a generator of (name, attribute) pairs
593
594
property with the specified name and interface.
594
595
"""
595
596
for name in (property_name,
596
property_name + u"_dbus_property"):
597
property_name + "_dbus_property"):
597
598
prop = getattr(self, name, None)
598
599
if (prop is None
599
600
or not self._is_dbus_property(prop)
603
604
continue
604
605
return prop
605
606
# No such property
606
raise DBusPropertyNotFound(self.dbus_object_path + u":"
607
+ interface_name + u"."
607
raise DBusPropertyNotFound(self.dbus_object_path + ":"
608
+ interface_name + "."
608
609
+ property_name)
609
610
610
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ss",
611
out_signature=u"v")
611
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
612
out_signature="v")
612
613
def Get(self, interface_name, property_name):
613
614
"""Standard D-Bus property Get() method, see D-Bus standard.
614
615
"""
615
616
prop = self._get_dbus_property(interface_name, property_name)
616
if prop._dbus_access == u"write":
617
if prop._dbus_access == "write":
617
618
raise DBusPropertyAccessException(property_name)
618
619
value = prop()
619
if not hasattr(value, u"variant_level"):
620
if not hasattr(value, "variant_level"):
620
621
return value
621
622
return type(value)(value, variant_level=value.variant_level+1)
622
623
623
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ssv")
624
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
624
625
def Set(self, interface_name, property_name, value):
625
626
"""Standard D-Bus property Set() method, see D-Bus standard.
626
627
"""
627
628
prop = self._get_dbus_property(interface_name, property_name)
628
if prop._dbus_access == u"read":
629
if prop._dbus_access == "read":
629
630
raise DBusPropertyAccessException(property_name)
630
if prop._dbus_get_args_options[u"byte_arrays"]:
631
if prop._dbus_get_args_options["byte_arrays"]:
631
632
# The byte_arrays option is not supported yet on
632
633
# signatures other than "ay".
633
if prop._dbus_signature != u"ay":
634
if prop._dbus_signature != "ay":
634
635
raise ValueError
635
636
value = dbus.ByteArray(''.join(unichr(byte)
636
637
for byte in value))
637
638
prop(value)
638
639
639
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"s",
640
out_signature=u"a{sv}")
640
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
641
out_signature="a{sv}")
641
642
def GetAll(self, interface_name):
642
643
"""Standard D-Bus property GetAll() method, see D-Bus
643
644
standard.
651
652
# Interface non-empty but did not match
652
653
continue
653
654
# Ignore write-only properties
654
if prop._dbus_access == u"write":
655
if prop._dbus_access == "write":
655
656
continue
656
657
value = prop()
657
if not hasattr(value, u"variant_level"):
658
if not hasattr(value, "variant_level"):
658
659
all[name] = value
659
660
continue
660
661
all[name] = type(value)(value, variant_level=
661
662
value.variant_level+1)
662
return dbus.Dictionary(all, signature=u"sv")
663
return dbus.Dictionary(all, signature="sv")
663
664
664
665
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
665
out_signature=u"s",
666
out_signature="s",
666
667
path_keyword='object_path',
667
668
connection_keyword='connection')
668
669
def Introspect(self, object_path, connection):
673
674
try:
674
675
document = xml.dom.minidom.parseString(xmlstring)
675
676
def make_tag(document, name, prop):
676
e = document.createElement(u"property")
677
e.setAttribute(u"name", name)
678
e.setAttribute(u"type", prop._dbus_signature)
679
e.setAttribute(u"access", prop._dbus_access)
677
e = document.createElement("property")
678
e.setAttribute("name", name)
679
e.setAttribute("type", prop._dbus_signature)
680
e.setAttribute("access", prop._dbus_access)
680
681
return e
681
for if_tag in document.getElementsByTagName(u"interface"):
682
for if_tag in document.getElementsByTagName("interface"):
682
683
for tag in (make_tag(document, name, prop)
683
684
for name, prop
684
685
in self._get_all_dbus_properties()
685
686
if prop._dbus_interface
686
== if_tag.getAttribute(u"name")):
687
== if_tag.getAttribute("name")):
687
688
if_tag.appendChild(tag)
688
689
# Add the names to the return values for the
689
690
# "org.freedesktop.DBus.Properties" methods
690
if (if_tag.getAttribute(u"name")
691
== u"org.freedesktop.DBus.Properties"):
692
for cn in if_tag.getElementsByTagName(u"method"):
693
if cn.getAttribute(u"name") == u"Get":
694
for arg in cn.getElementsByTagName(u"arg"):
695
if (arg.getAttribute(u"direction")
696
== u"out"):
697
arg.setAttribute(u"name", u"value")
698
elif cn.getAttribute(u"name") == u"GetAll":
699
for arg in cn.getElementsByTagName(u"arg"):
700
if (arg.getAttribute(u"direction")
701
== u"out"):
702
arg.setAttribute(u"name", u"props")
703
xmlstring = document.toxml(u"utf-8")
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")
704
705
document.unlink()
705
706
except (AttributeError, xml.dom.DOMException,
706
707
xml.parsers.expat.ExpatError), error:
707
logger.error(u"Failed to override Introspection method",
708
logger.error("Failed to override Introspection method",
708
709
error)
709
710
return xmlstring
710
711
718
719
"""
719
720
720
721
runtime_expansions = (Client.runtime_expansions
721
+ (u"dbus_object_path",))
722
+ ("dbus_object_path",))
722
723
723
724
# dbus.service.Object doesn't use super(), so we can't either.
724
725
729
730
# Only now, when this client is initialized, can it show up on
730
731
# the D-Bus
731
732
client_object_name = unicode(self.name).translate(
732
{ord(u"."): ord(u"_"),
733
ord(u"-"): ord(u"_")})
733
{ord("."): ord("_"),
734
ord("-"): ord("_")})
734
735
self.dbus_object_path = (dbus.ObjectPath
735
(u"/clients/" + client_object_name))
736
("/clients/" + client_object_name))
736
737
DBusObjectWithProperties.__init__(self, self.bus,
737
738
self.dbus_object_path)
738
739
745
746
if (hasattr(self, "dbus_object_path")
746
747
and bval is not bool(old_value)):
747
748
dbus_bool = dbus.Boolean(bval, variant_level=1)
748
self.PropertyChanged(dbus.String(u"ApprovalPending"),
749
self.PropertyChanged(dbus.String("ApprovalPending"),
749
750
dbus_bool)
750
751
751
752
approvals_pending = property(_get_approvals_pending,
759
760
variant_level=variant_level)
760
761
761
762
def enable(self):
762
oldstate = getattr(self, u"enabled", False)
763
oldstate = getattr(self, "enabled", False)
763
764
r = Client.enable(self)
764
765
if oldstate != self.enabled:
765
766
# Emit D-Bus signals
766
self.PropertyChanged(dbus.String(u"Enabled"),
767
self.PropertyChanged(dbus.String("Enabled"),
767
768
dbus.Boolean(True, variant_level=1))
768
769
self.PropertyChanged(
769
dbus.String(u"LastEnabled"),
770
dbus.String("LastEnabled"),
770
771
self._datetime_to_dbus(self.last_enabled,
771
772
variant_level=1))
772
773
return r
773
774
774
775
def disable(self, quiet = False):
775
oldstate = getattr(self, u"enabled", False)
776
oldstate = getattr(self, "enabled", False)
776
777
r = Client.disable(self, quiet=quiet)
777
778
if not quiet and oldstate != self.enabled:
778
779
# Emit D-Bus signal
779
self.PropertyChanged(dbus.String(u"Enabled"),
780
self.PropertyChanged(dbus.String("Enabled"),
780
781
dbus.Boolean(False, variant_level=1))
781
782
return r
782
783
785
786
self.remove_from_connection()
786
787
except LookupError:
787
788
pass
788
if hasattr(DBusObjectWithProperties, u"__del__"):
789
if hasattr(DBusObjectWithProperties, "__del__"):
789
790
DBusObjectWithProperties.__del__(self, *args, **kwargs)
790
791
Client.__del__(self, *args, **kwargs)
791
792
794
795
self.checker_callback_tag = None
795
796
self.checker = None
796
797
# Emit D-Bus signal
797
self.PropertyChanged(dbus.String(u"CheckerRunning"),
798
self.PropertyChanged(dbus.String("CheckerRunning"),
798
799
dbus.Boolean(False, variant_level=1))
799
800
if os.WIFEXITED(condition):
800
801
exitstatus = os.WEXITSTATUS(condition)
815
816
r = Client.checked_ok(self, *args, **kwargs)
816
817
# Emit D-Bus signal
817
818
self.PropertyChanged(
818
dbus.String(u"LastCheckedOK"),
819
dbus.String("LastCheckedOK"),
819
820
(self._datetime_to_dbus(self.last_checked_ok,
820
821
variant_level=1)))
821
822
return r
824
825
r = Client.need_approval(self, *args, **kwargs)
825
826
# Emit D-Bus signal
826
827
self.PropertyChanged(
827
dbus.String(u"LastApprovalRequest"),
828
dbus.String("LastApprovalRequest"),
828
829
(self._datetime_to_dbus(self.last_approval_request,
829
830
variant_level=1)))
830
831
return r
842
843
# Emit D-Bus signal
843
844
self.CheckerStarted(self.current_checker_command)
844
845
self.PropertyChanged(
845
dbus.String(u"CheckerRunning"),
846
dbus.String("CheckerRunning"),
846
847
dbus.Boolean(True, variant_level=1))
847
848
return r
848
849
849
850
def stop_checker(self, *args, **kwargs):
850
old_checker = getattr(self, u"checker", None)
851
old_checker = getattr(self, "checker", None)
851
852
r = Client.stop_checker(self, *args, **kwargs)
852
853
if (old_checker is not None
853
and getattr(self, u"checker", None) is None):
854
self.PropertyChanged(dbus.String(u"CheckerRunning"),
854
and getattr(self, "checker", None) is None):
855
self.PropertyChanged(dbus.String("CheckerRunning"),
855
856
dbus.Boolean(False, variant_level=1))
856
857
return r
857
858
868
869
869
870
870
871
## D-Bus methods, signals & properties
871
_interface = u"se.bsnet.fukt.Mandos.Client"
872
_interface = "se.bsnet.fukt.Mandos.Client"
872
873
873
874
## Signals
874
875
875
876
# CheckerCompleted - signal
876
@dbus.service.signal(_interface, signature=u"nxs")
877
@dbus.service.signal(_interface, signature="nxs")
877
878
def CheckerCompleted(self, exitcode, waitstatus, command):
878
879
"D-Bus signal"
879
880
pass
880
881
881
882
# CheckerStarted - signal
882
@dbus.service.signal(_interface, signature=u"s")
883
@dbus.service.signal(_interface, signature="s")
883
884
def CheckerStarted(self, command):
884
885
"D-Bus signal"
885
886
pass
886
887
887
888
# PropertyChanged - signal
888
@dbus.service.signal(_interface, signature=u"sv")
889
@dbus.service.signal(_interface, signature="sv")
889
890
def PropertyChanged(self, property, value):
890
891
"D-Bus signal"
891
892
pass
900
901
pass
901
902
902
903
# Rejected - signal
903
@dbus.service.signal(_interface, signature=u"s")
904
@dbus.service.signal(_interface, signature="s")
904
905
def Rejected(self, reason):
905
906
"D-Bus signal"
906
907
pass
907
908
908
909
# NeedApproval - signal
909
@dbus.service.signal(_interface, signature=u"tb")
910
@dbus.service.signal(_interface, signature="tb")
910
911
def NeedApproval(self, timeout, default):
911
912
"D-Bus signal"
912
913
return self.need_approval()
914
915
## Methods
915
916
916
917
# Approve - method
917
@dbus.service.method(_interface, in_signature=u"b")
918
@dbus.service.method(_interface, in_signature="b")
918
919
def Approve(self, value):
919
920
self.approve(value)
920
921
949
950
## Properties
950
951
951
952
# ApprovalPending - property
952
@dbus_service_property(_interface, signature=u"b", access=u"read")
953
@dbus_service_property(_interface, signature="b", access="read")
953
954
def ApprovalPending_dbus_property(self):
954
955
return dbus.Boolean(bool(self.approvals_pending))
955
956
956
957
# ApprovedByDefault - property
957
@dbus_service_property(_interface, signature=u"b",
958
access=u"readwrite")
958
@dbus_service_property(_interface, signature="b",
959
access="readwrite")
959
960
def ApprovedByDefault_dbus_property(self, value=None):
960
961
if value is None: # get
961
962
return dbus.Boolean(self.approved_by_default)
962
963
self.approved_by_default = bool(value)
963
964
# Emit D-Bus signal
964
self.PropertyChanged(dbus.String(u"ApprovedByDefault"),
965
self.PropertyChanged(dbus.String("ApprovedByDefault"),
965
966
dbus.Boolean(value, variant_level=1))
966
967
967
968
# ApprovalDelay - property
968
@dbus_service_property(_interface, signature=u"t",
969
access=u"readwrite")
969
@dbus_service_property(_interface, signature="t",
970
access="readwrite")
970
971
def ApprovalDelay_dbus_property(self, value=None):
971
972
if value is None: # get
972
973
return dbus.UInt64(self.approval_delay_milliseconds())
973
974
self.approval_delay = datetime.timedelta(0, 0, 0, value)
974
975
# Emit D-Bus signal
975
self.PropertyChanged(dbus.String(u"ApprovalDelay"),
976
self.PropertyChanged(dbus.String("ApprovalDelay"),
976
977
dbus.UInt64(value, variant_level=1))
977
978
978
979
# ApprovalDuration - property
979
@dbus_service_property(_interface, signature=u"t",
980
access=u"readwrite")
980
@dbus_service_property(_interface, signature="t",
981
access="readwrite")
981
982
def ApprovalDuration_dbus_property(self, value=None):
982
983
if value is None: # get
983
984
return dbus.UInt64(self._timedelta_to_milliseconds(
984
985
self.approval_duration))
985
986
self.approval_duration = datetime.timedelta(0, 0, 0, value)
986
987
# Emit D-Bus signal
987
self.PropertyChanged(dbus.String(u"ApprovalDuration"),
988
self.PropertyChanged(dbus.String("ApprovalDuration"),
988
989
dbus.UInt64(value, variant_level=1))
989
990
990
991
# Name - property
991
@dbus_service_property(_interface, signature=u"s", access=u"read")
992
@dbus_service_property(_interface, signature="s", access="read")
992
993
def Name_dbus_property(self):
993
994
return dbus.String(self.name)
994
995
995
996
# Fingerprint - property
996
@dbus_service_property(_interface, signature=u"s", access=u"read")
997
@dbus_service_property(_interface, signature="s", access="read")
997
998
def Fingerprint_dbus_property(self):
998
999
return dbus.String(self.fingerprint)
999
1000
1000
1001
# Host - property
1001
@dbus_service_property(_interface, signature=u"s",
1002
access=u"readwrite")
1002
@dbus_service_property(_interface, signature="s",
1003
access="readwrite")
1003
1004
def Host_dbus_property(self, value=None):
1004
1005
if value is None: # get
1005
1006
return dbus.String(self.host)
1006
1007
self.host = value
1007
1008
# Emit D-Bus signal
1008
self.PropertyChanged(dbus.String(u"Host"),
1009
self.PropertyChanged(dbus.String("Host"),
1009
1010
dbus.String(value, variant_level=1))
1010
1011
1011
1012
# Created - property
1012
@dbus_service_property(_interface, signature=u"s", access=u"read")
1013
@dbus_service_property(_interface, signature="s", access="read")
1013
1014
def Created_dbus_property(self):
1014
1015
return dbus.String(self._datetime_to_dbus(self.created))
1015
1016
1016
1017
# LastEnabled - property
1017
@dbus_service_property(_interface, signature=u"s", access=u"read")
1018
@dbus_service_property(_interface, signature="s", access="read")
1018
1019
def LastEnabled_dbus_property(self):
1019
1020
if self.last_enabled is None:
1020
return dbus.String(u"")
1021
return dbus.String("")
1021
1022
return dbus.String(self._datetime_to_dbus(self.last_enabled))
1022
1023
1023
1024
# Enabled - property
1024
@dbus_service_property(_interface, signature=u"b",
1025
access=u"readwrite")
1025
@dbus_service_property(_interface, signature="b",
1026
access="readwrite")
1026
1027
def Enabled_dbus_property(self, value=None):
1027
1028
if value is None: # get
1028
1029
return dbus.Boolean(self.enabled)
1032
1033
self.disable()
1033
1034
1034
1035
# LastCheckedOK - property
1035
@dbus_service_property(_interface, signature=u"s",
1036
access=u"readwrite")
1036
@dbus_service_property(_interface, signature="s",
1037
access="readwrite")
1037
1038
def LastCheckedOK_dbus_property(self, value=None):
1038
1039
if value is not None:
1039
1040
self.checked_ok()
1040
1041
return
1041
1042
if self.last_checked_ok is None:
1042
return dbus.String(u"")
1043
return dbus.String("")
1043
1044
return dbus.String(self._datetime_to_dbus(self
1044
1045
.last_checked_ok))
1045
1046
1046
1047
# LastApprovalRequest - property
1047
@dbus_service_property(_interface, signature=u"s", access=u"read")
1048
@dbus_service_property(_interface, signature="s", access="read")
1048
1049
def LastApprovalRequest_dbus_property(self):
1049
1050
if self.last_approval_request is None:
1050
return dbus.String(u"")
1051
return dbus.String("")
1051
1052
return dbus.String(self.
1052
1053
_datetime_to_dbus(self
1053
1054
.last_approval_request))
1054
1055
1055
1056
# Timeout - property
1056
@dbus_service_property(_interface, signature=u"t",
1057
access=u"readwrite")
1057
@dbus_service_property(_interface, signature="t",
1058
access="readwrite")
1058
1059
def Timeout_dbus_property(self, value=None):
1059
1060
if value is None: # get
1060
1061
return dbus.UInt64(self.timeout_milliseconds())
1061
1062
self.timeout = datetime.timedelta(0, 0, 0, value)
1062
1063
# Emit D-Bus signal
1063
self.PropertyChanged(dbus.String(u"Timeout"),
1064
self.PropertyChanged(dbus.String("Timeout"),
1064
1065
dbus.UInt64(value, variant_level=1))
1065
if getattr(self, u"disable_initiator_tag", None) is None:
1066
if getattr(self, "disable_initiator_tag", None) is None:
1066
1067
return
1067
1068
# Reschedule timeout
1068
1069
gobject.source_remove(self.disable_initiator_tag)
1081
1082
(time_to_die, self.disable))
1082
1083
1083
1084
# Interval - property
1084
@dbus_service_property(_interface, signature=u"t",
1085
access=u"readwrite")
1085
@dbus_service_property(_interface, signature="t",
1086
access="readwrite")
1086
1087
def Interval_dbus_property(self, value=None):
1087
1088
if value is None: # get
1088
1089
return dbus.UInt64(self.interval_milliseconds())
1089
1090
self.interval = datetime.timedelta(0, 0, 0, value)
1090
1091
# Emit D-Bus signal
1091
self.PropertyChanged(dbus.String(u"Interval"),
1092
self.PropertyChanged(dbus.String("Interval"),
1092
1093
dbus.UInt64(value, variant_level=1))
1093
if getattr(self, u"checker_initiator_tag", None) is None:
1094
if getattr(self, "checker_initiator_tag", None) is None:
1094
1095
return
1095
1096
# Reschedule checker run
1096
1097
gobject.source_remove(self.checker_initiator_tag)
1099
1100
self.start_checker() # Start one now, too
1100
1101
1101
1102
# Checker - property
1102
@dbus_service_property(_interface, signature=u"s",
1103
access=u"readwrite")
1103
@dbus_service_property(_interface, signature="s",
1104
access="readwrite")
1104
1105
def Checker_dbus_property(self, value=None):
1105
1106
if value is None: # get
1106
1107
return dbus.String(self.checker_command)
1107
1108
self.checker_command = value
1108
1109
# Emit D-Bus signal
1109
self.PropertyChanged(dbus.String(u"Checker"),
1110
self.PropertyChanged(dbus.String("Checker"),
1110
1111
dbus.String(self.checker_command,
1111
1112
variant_level=1))
1112
1113
1113
1114
# CheckerRunning - property
1114
@dbus_service_property(_interface, signature=u"b",
1115
access=u"readwrite")
1115
@dbus_service_property(_interface, signature="b",
1116
access="readwrite")
1116
1117
def CheckerRunning_dbus_property(self, value=None):
1117
1118
if value is None: # get
1118
1119
return dbus.Boolean(self.checker is not None)
1122
1123
self.stop_checker()
1123
1124
1124
1125
# ObjectPath - property
1125
@dbus_service_property(_interface, signature=u"o", access=u"read")
1126
@dbus_service_property(_interface, signature="o", access="read")
1126
1127
def ObjectPath_dbus_property(self):
1127
1128
return self.dbus_object_path # is already a dbus.ObjectPath
1128
1129
1129
1130
# Secret = property
1130
@dbus_service_property(_interface, signature=u"ay",
1131
access=u"write", byte_arrays=True)
1131
@dbus_service_property(_interface, signature="ay",
1132
access="write", byte_arrays=True)
1132
1133
def Secret_dbus_property(self, value):
1133
1134
self.secret = str(value)
1134
1135
1169
1170
1170
1171
def handle(self):
1171
1172
with contextlib.closing(self.server.child_pipe) as child_pipe:
1172
logger.info(u"TCP connection from: %s",
1173
logger.info("TCP connection from: %s",
1173
1174
unicode(self.client_address))
1174
logger.debug(u"Pipe FD: %d",
1175
logger.debug("Pipe FD: %d",
1175
1176
self.server.child_pipe.fileno())
1176
1177
1177
1178
session = (gnutls.connection
1184
1185
# no X.509 keys are added to it. Therefore, we can use it
1185
1186
# here despite using OpenPGP certificates.
1186
1187
1187
#priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
1188
# u"+AES-256-CBC", u"+SHA1",
1189
# u"+COMP-NULL", u"+CTYPE-OPENPGP",
1190
# u"+DHE-DSS"))
1188
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1189
# "+AES-256-CBC", "+SHA1",
1190
# "+COMP-NULL", "+CTYPE-OPENPGP",
1191
# "+DHE-DSS"))
1191
1192
# Use a fallback default, since this MUST be set.
1192
1193
priority = self.server.gnutls_priority
1193
1194
if priority is None:
1194
priority = u"NORMAL"
1195
priority = "NORMAL"
1195
1196
(gnutls.library.functions
1196
1197
.gnutls_priority_set_direct(session._c_object,
1197
1198
priority, None))
1199
1200
# Start communication using the Mandos protocol
1200
1201
# Get protocol number
1201
1202
line = self.request.makefile().readline()
1202
logger.debug(u"Protocol version: %r", line)
1203
logger.debug("Protocol version: %r", line)
1203
1204
try:
1204
1205
if int(line.strip().split()[0]) > 1:
1205
1206
raise RuntimeError
1206
1207
except (ValueError, IndexError, RuntimeError), error:
1207
logger.error(u"Unknown protocol version: %s", error)
1208
logger.error("Unknown protocol version: %s", error)
1208
1209
return
1209
1210
1210
1211
# Start GnuTLS connection
1211
1212
try:
1212
1213
session.handshake()
1213
1214
except gnutls.errors.GNUTLSError, error:
1214
logger.warning(u"Handshake failed: %s", error)
1215
logger.warning("Handshake failed: %s", error)
1215
1216
# Do not run session.bye() here: the session is not
1216
1217
# established. Just abandon the request.
1217
1218
return
1218
logger.debug(u"Handshake succeeded")
1219
logger.debug("Handshake succeeded")
1219
1220
1220
1221
approval_required = False
1221
1222
try:
1223
1224
fpr = self.fingerprint(self.peer_certificate
1224
1225
(session))
1225
1226
except (TypeError, gnutls.errors.GNUTLSError), error:
1226
logger.warning(u"Bad certificate: %s", error)
1227
logger.warning("Bad certificate: %s", error)
1227
1228
return
1228
logger.debug(u"Fingerprint: %s", fpr)
1229
logger.debug("Fingerprint: %s", fpr)
1229
1230
1230
1231
try:
1231
1232
client = ProxyClient(child_pipe, fpr,
1240
1241
1241
1242
while True:
1242
1243
if not client.enabled:
1243
logger.warning(u"Client %s is disabled",
1244
logger.warning("Client %s is disabled",
1244
1245
client.name)
1245
1246
if self.server.use_dbus:
1246
1247
# Emit D-Bus signal
1251
1252
#We are approved or approval is disabled
1252
1253
break
1253
1254
elif client._approved is None:
1254
logger.info(u"Client %s needs approval",
1255
logger.info("Client %s needs approval",
1255
1256
client.name)
1256
1257
if self.server.use_dbus:
1257
1258
# Emit D-Bus signal
1259
1260
client.approval_delay_milliseconds(),
1260
1261
client.approved_by_default)
1261
1262
else:
1262
logger.warning(u"Client %s was not approved",
1263
logger.warning("Client %s was not approved",
1263
1264
client.name)
1264
1265
if self.server.use_dbus:
1265
1266
# Emit D-Bus signal
1294
1295
except (gnutls.errors.GNUTLSError), error:
1295
1296
logger.warning("gnutls send failed")
1296
1297
return
1297
logger.debug(u"Sent: %d, remaining: %d",
1298
logger.debug("Sent: %d, remaining: %d",
1298
1299
sent, len(client.secret)
1299
1300
- (sent_size + sent))
1300
1301
sent_size += sent
1301
1302
1302
logger.info(u"Sending secret to %s", client.name)
1303
logger.info("Sending secret to %s", client.name)
1303
1304
# bump the timeout as if seen
1304
1305
client.checked_ok()
1305
1306
if self.server.use_dbus:
1328
1329
.gnutls_certificate_get_peers
1329
1330
(session._c_object, ctypes.byref(list_size)))
1330
1331
if not bool(cert_list) and list_size.value != 0:
1331
raise gnutls.errors.GNUTLSError(u"error getting peer"
1332
u" certificate")
1332
raise gnutls.errors.GNUTLSError("error getting peer"
1333
" certificate")
1333
1334
if list_size.value == 0:
1334
1335
return None
1335
1336
cert = cert_list[0]
1361
1362
if crtverify.value != 0:
1362
1363
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1363
1364
raise (gnutls.errors.CertificateSecurityError
1364
(u"Verify failed"))
1365
("Verify failed"))
1365
1366
# New buffer for the fingerprint
1366
1367
buf = ctypes.create_string_buffer(20)
1367
1368
buf_len = ctypes.c_size_t()
1374
1375
# Convert the buffer to a Python bytestring
1375
1376
fpr = ctypes.string_at(buf, buf_len.value)
1376
1377
# Convert the bytestring to hexadecimal notation
1377
hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
1378
hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
1378
1379
return hex_fpr
1379
1380
1380
1381
1408
1409
1409
1410
def add_pipe(self, parent_pipe):
1410
1411
"""Dummy function; override as necessary"""
1411
pass
1412
raise NotImplementedError
1412
1413
1413
1414
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1414
1415
socketserver.TCPServer, object):
1432
1433
bind to an address or port if they were not specified."""
1433
1434
if self.interface is not None:
1434
1435
if SO_BINDTODEVICE is None:
1435
logger.error(u"SO_BINDTODEVICE does not exist;"
1436
u" cannot bind to interface %s",
1436
logger.error("SO_BINDTODEVICE does not exist;"
1437
" cannot bind to interface %s",
1437
1438
self.interface)
1438
1439
else:
1439
1440
try:
1440
1441
self.socket.setsockopt(socket.SOL_SOCKET,
1441
1442
SO_BINDTODEVICE,
1442
1443
str(self.interface
1443
+ u'\0'))
1444
+ '\0'))
1444
1445
except socket.error, error:
1445
1446
if error[0] == errno.EPERM:
1446
logger.error(u"No permission to"
1447
u" bind to interface %s",
1447
logger.error("No permission to"
1448
" bind to interface %s",
1448
1449
self.interface)
1449
1450
elif error[0] == errno.ENOPROTOOPT:
1450
logger.error(u"SO_BINDTODEVICE not available;"
1451
u" cannot bind to interface %s",
1451
logger.error("SO_BINDTODEVICE not available;"
1452
" cannot bind to interface %s",
1452
1453
self.interface)
1453
1454
else:
1454
1455
raise
1456
1457
if self.server_address[0] or self.server_address[1]:
1457
1458
if not self.server_address[0]:
1458
1459
if self.address_family == socket.AF_INET6:
1459
any_address = u"::" # in6addr_any
1460
any_address = "::" # in6addr_any
1460
1461
else:
1461
1462
any_address = socket.INADDR_ANY
1462
1463
self.server_address = (any_address,
1511
1512
def handle_ipc(self, source, condition, parent_pipe=None,
1512
1513
client_object=None):
1513
1514
condition_names = {
1514
gobject.IO_IN: u"IN", # There is data to read.
1515
gobject.IO_OUT: u"OUT", # Data can be written (without
1515
gobject.IO_IN: "IN", # There is data to read.
1516
gobject.IO_OUT: "OUT", # Data can be written (without
1516
1517
# blocking).
1517
gobject.IO_PRI: u"PRI", # There is urgent data to read.
1518
gobject.IO_ERR: u"ERR", # Error condition.
1519
gobject.IO_HUP: u"HUP" # Hung up (the connection has been
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
1520
1521
# broken, usually for pipes and
1521
1522
# sockets).
1522
1523
}
1541
1542
client = c
1542
1543
break
1543
1544
else:
1544
logger.warning(u"Client not found for fingerprint: %s, ad"
1545
u"dress: %s", fpr, address)
1545
logger.warning("Client not found for fingerprint: %s, ad"
1546
"dress: %s", fpr, address)
1546
1547
if self.use_dbus:
1547
1548
# Emit D-Bus signal
1548
1549
mandos_dbus_service.ClientNotFound(fpr, address[0])
1582
1583
def string_to_delta(interval):
1583
1584
"""Parse a string and return a datetime.timedelta
1584
1585
1585
>>> string_to_delta(u'7d')
1586
>>> string_to_delta('7d')
1586
1587
datetime.timedelta(7)
1587
>>> string_to_delta(u'60s')
1588
>>> string_to_delta('60s')
1588
1589
datetime.timedelta(0, 60)
1589
>>> string_to_delta(u'60m')
1590
>>> string_to_delta('60m')
1590
1591
datetime.timedelta(0, 3600)
1591
>>> string_to_delta(u'24h')
1592
>>> string_to_delta('24h')
1592
1593
datetime.timedelta(1)
1593
>>> string_to_delta(u'1w')
1594
>>> string_to_delta('1w')
1594
1595
datetime.timedelta(7)
1595
>>> string_to_delta(u'5m 30s')
1596
>>> string_to_delta('5m 30s')
1596
1597
datetime.timedelta(0, 330)
1597
1598
"""
1598
1599
timevalue = datetime.timedelta(0)
1600
1601
try:
1601
1602
suffix = unicode(s[-1])
1602
1603
value = int(s[:-1])
1603
if suffix == u"d":
1604
if suffix == "d":
1604
1605
delta = datetime.timedelta(value)
1605
elif suffix == u"s":
1606
elif suffix == "s":
1606
1607
delta = datetime.timedelta(0, value)
1607
elif suffix == u"m":
1608
elif suffix == "m":
1608
1609
delta = datetime.timedelta(0, 0, 0, 0, value)
1609
elif suffix == u"h":
1610
elif suffix == "h":
1610
1611
delta = datetime.timedelta(0, 0, 0, 0, 0, value)
1611
elif suffix == u"w":
1612
elif suffix == "w":
1612
1613
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1613
1614
else:
1614
raise ValueError(u"Unknown suffix %r" % suffix)
1615
raise ValueError("Unknown suffix %r" % suffix)
1615
1616
except (ValueError, IndexError), e:
1616
raise ValueError(e.message)
1617
raise ValueError(*(e.args))
1617
1618
timevalue += delta
1618
1619
return timevalue
1619
1620
1625
1626
global if_nametoindex
1626
1627
try:
1627
1628
if_nametoindex = (ctypes.cdll.LoadLibrary
1628
(ctypes.util.find_library(u"c"))
1629
(ctypes.util.find_library("c"))
1629
1630
.if_nametoindex)
1630
1631
except (OSError, AttributeError):
1631
logger.warning(u"Doing if_nametoindex the hard way")
1632
logger.warning("Doing if_nametoindex the hard way")
1632
1633
def if_nametoindex(interface):
1633
1634
"Get an interface index the hard way, i.e. using fcntl()"
1634
1635
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
1635
1636
with contextlib.closing(socket.socket()) as s:
1636
1637
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1637
struct.pack(str(u"16s16x"),
1638
struct.pack(str("16s16x"),
1638
1639
interface))
1639
interface_index = struct.unpack(str(u"I"),
1640
interface_index = struct.unpack(str("I"),
1640
1641
ifreq[16:20])[0]
1641
1642
return interface_index
1642
1643
return if_nametoindex(interface)
1650
1651
sys.exit()
1651
1652
os.setsid()
1652
1653
if not nochdir:
1653
os.chdir(u"/")
1654
os.chdir("/")
1654
1655
if os.fork():
1655
1656
sys.exit()
1656
1657
if not noclose:
1658
1659
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1659
1660
if not stat.S_ISCHR(os.fstat(null).st_mode):
1660
1661
raise OSError(errno.ENODEV,
1661
u"%s not a character device"
1662
"%s not a character device"
1662
1663
% os.path.devnull)
1663
1664
os.dup2(null, sys.stdin.fileno())
1664
1665
os.dup2(null, sys.stdout.fileno())
1673
1674
# Parsing of options, both command line and config file
1674
1675
1675
1676
parser = optparse.OptionParser(version = "%%prog %s" % version)
1676
parser.add_option("-i", u"--interface", type=u"string",
1677
metavar="IF", help=u"Bind to interface IF")
1678
parser.add_option("-a", u"--address", type=u"string",
1679
help=u"Address to listen for requests on")
1680
parser.add_option("-p", u"--port", type=u"int",
1681
help=u"Port number to receive requests on")
1682
parser.add_option("--check", action=u"store_true",
1683
help=u"Run self-test")
1684
parser.add_option("--debug", action=u"store_true",
1685
help=u"Debug mode; run in foreground and log to"
1686
u" terminal")
1687
parser.add_option("--debuglevel", type=u"string", metavar="LEVEL",
1688
help=u"Debug level for stdout output")
1689
parser.add_option("--priority", type=u"string", help=u"GnuTLS"
1690
u" priority string (see GnuTLS documentation)")
1691
parser.add_option("--servicename", type=u"string",
1692
metavar=u"NAME", help=u"Zeroconf service name")
1693
parser.add_option("--configdir", type=u"string",
1694
default=u"/etc/mandos", metavar=u"DIR",
1695
help=u"Directory to search for configuration"
1696
u" files")
1697
parser.add_option("--no-dbus", action=u"store_false",
1698
dest=u"use_dbus", help=u"Do not provide D-Bus"
1699
u" system bus interface")
1700
parser.add_option("--no-ipv6", action=u"store_false",
1701
dest=u"use_ipv6", help=u"Do not use IPv6")
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")
1702
1703
options = parser.parse_args()[0]
1703
1704
1704
1705
if options.check:
1707
1708
sys.exit()
1708
1709
1709
1710
# Default values for config file for server-global settings
1710
server_defaults = { u"interface": u"",
1711
u"address": u"",
1712
u"port": u"",
1713
u"debug": u"False",
1714
u"priority":
1715
u"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1716
u"servicename": u"Mandos",
1717
u"use_dbus": u"True",
1718
u"use_ipv6": u"True",
1719
u"debuglevel": u"",
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": "",
1720
1721
}
1721
1722
1722
1723
# Parse config file for server-global settings
1723
1724
server_config = configparser.SafeConfigParser(server_defaults)
1724
1725
del server_defaults
1725
1726
server_config.read(os.path.join(options.configdir,
1726
u"mandos.conf"))
1727
"mandos.conf"))
1727
1728
# Convert the SafeConfigParser object to a dict
1728
1729
server_settings = server_config.defaults()
1729
1730
# Use the appropriate methods on the non-string config options
1730
for option in (u"debug", u"use_dbus", u"use_ipv6"):
1731
server_settings[option] = server_config.getboolean(u"DEFAULT",
1731
for option in ("debug", "use_dbus", "use_ipv6"):
1732
server_settings[option] = server_config.getboolean("DEFAULT",
1732
1733
option)
1733
1734
if server_settings["port"]:
1734
server_settings["port"] = server_config.getint(u"DEFAULT",
1735
u"port")
1735
server_settings["port"] = server_config.getint("DEFAULT",
1736
"port")
1736
1737
del server_config
1737
1738
1738
1739
# Override the settings from the config file with command line
1739
1740
# options, if set.
1740
for option in (u"interface", u"address", u"port", u"debug",
1741
u"priority", u"servicename", u"configdir",
1742
u"use_dbus", u"use_ipv6", u"debuglevel"):
1741
for option in ("interface", "address", "port", "debug",
1742
"priority", "servicename", "configdir",
1743
"use_dbus", "use_ipv6", "debuglevel"):
1743
1744
value = getattr(options, option)
1744
1745
if value is not None:
1745
1746
server_settings[option] = value
1753
1754
##################################################################
1754
1755
1755
1756
# For convenience
1756
debug = server_settings[u"debug"]
1757
debuglevel = server_settings[u"debuglevel"]
1758
use_dbus = server_settings[u"use_dbus"]
1759
use_ipv6 = server_settings[u"use_ipv6"]
1757
debug = server_settings["debug"]
1758
debuglevel = server_settings["debuglevel"]
1759
use_dbus = server_settings["use_dbus"]
1760
use_ipv6 = server_settings["use_ipv6"]
1760
1761
1761
if server_settings[u"servicename"] != u"Mandos":
1762
if server_settings["servicename"] != "Mandos":
1762
1763
syslogger.setFormatter(logging.Formatter
1763
(u'Mandos (%s) [%%(process)d]:'
1764
u' %%(levelname)s: %%(message)s'
1765
% server_settings[u"servicename"]))
1764
('Mandos (%s) [%%(process)d]:'
1765
' %%(levelname)s: %%(message)s'
1766
% server_settings["servicename"]))
1766
1767
1767
1768
# Parse config file with clients
1768
client_defaults = { u"timeout": u"1h",
1769
u"interval": u"5m",
1770
u"checker": u"fping -q -- %%(host)s",
1771
u"host": u"",
1772
u"approval_delay": u"0s",
1773
u"approval_duration": u"1s",
1769
client_defaults = { "timeout": "1h",
1770
"interval": "5m",
1771
"checker": "fping -q -- %%(host)s",
1772
"host": "",
1773
"approval_delay": "0s",
1774
"approval_duration": "1s",
1774
1775
}
1775
1776
client_config = configparser.SafeConfigParser(client_defaults)
1776
client_config.read(os.path.join(server_settings[u"configdir"],
1777
u"clients.conf"))
1777
client_config.read(os.path.join(server_settings["configdir"],
1778
"clients.conf"))
1778
1779
1779
1780
global mandos_dbus_service
1780
1781
mandos_dbus_service = None
1781
1782
1782
tcp_server = MandosServer((server_settings[u"address"],
1783
server_settings[u"port"]),
1783
tcp_server = MandosServer((server_settings["address"],
1784
server_settings["port"]),
1784
1785
ClientHandler,
1785
interface=(server_settings[u"interface"]
1786
interface=(server_settings["interface"]
1786
1787
or None),
1787
1788
use_ipv6=use_ipv6,
1788
1789
gnutls_priority=
1789
server_settings[u"priority"],
1790
server_settings["priority"],
1790
1791
use_dbus=use_dbus)
1791
1792
if not debug:
1792
pidfilename = u"/var/run/mandos.pid"
1793
pidfilename = "/var/run/mandos.pid"
1793
1794
try:
1794
pidfile = open(pidfilename, u"w")
1795
pidfile = open(pidfilename, "w")
1795
1796
except IOError:
1796
logger.error(u"Could not open file %r", pidfilename)
1797
logger.error("Could not open file %r", pidfilename)
1797
1798
1798
1799
try:
1799
uid = pwd.getpwnam(u"_mandos").pw_uid
1800
gid = pwd.getpwnam(u"_mandos").pw_gid
1800
uid = pwd.getpwnam("_mandos").pw_uid
1801
gid = pwd.getpwnam("_mandos").pw_gid
1801
1802
except KeyError:
1802
1803
try:
1803
uid = pwd.getpwnam(u"mandos").pw_uid
1804
gid = pwd.getpwnam(u"mandos").pw_gid
1804
uid = pwd.getpwnam("mandos").pw_uid
1805
gid = pwd.getpwnam("mandos").pw_gid
1805
1806
except KeyError:
1806
1807
try:
1807
uid = pwd.getpwnam(u"nobody").pw_uid
1808
gid = pwd.getpwnam(u"nobody").pw_gid
1808
uid = pwd.getpwnam("nobody").pw_uid
1809
gid = pwd.getpwnam("nobody").pw_gid
1809
1810
except KeyError:
1810
1811
uid = 65534
1811
1812
gid = 65534
1833
1834
1834
1835
@gnutls.library.types.gnutls_log_func
1835
1836
def debug_gnutls(level, string):
1836
logger.debug(u"GnuTLS: %s", string[:-1])
1837
logger.debug("GnuTLS: %s", string[:-1])
1837
1838
1838
1839
(gnutls.library.functions
1839
1840
.gnutls_global_set_log_function(debug_gnutls))
1847
1848
# No console logging
1848
1849
logger.removeHandler(console)
1849
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()
1850
1855
1851
1856
global main_loop
1852
1857
# From the Avahi example code
1856
1861
# End of Avahi example code
1857
1862
if use_dbus:
1858
1863
try:
1859
bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos",
1864
bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
1860
1865
bus, do_not_queue=True)
1861
1866
except dbus.exceptions.NameExistsException, e:
1862
logger.error(unicode(e) + u", disabling D-Bus")
1867
logger.error(unicode(e) + ", disabling D-Bus")
1863
1868
use_dbus = False
1864
server_settings[u"use_dbus"] = False
1869
server_settings["use_dbus"] = False
1865
1870
tcp_server.use_dbus = False
1866
1871
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1867
service = AvahiService(name = server_settings[u"servicename"],
1868
servicetype = u"_mandos._tcp",
1872
service = AvahiService(name = server_settings["servicename"],
1873
servicetype = "_mandos._tcp",
1869
1874
protocol = protocol, bus = bus)
1870
1875
if server_settings["interface"]:
1871
1876
service.interface = (if_nametoindex
1872
(str(server_settings[u"interface"])))
1873
1874
if not debug:
1875
# Close all input and output, do double fork, etc.
1876
daemon()
1877
1877
(str(server_settings["interface"])))
1878
1878
1879
global multiprocessing_manager
1879
1880
multiprocessing_manager = multiprocessing.Manager()
1880
1881
1899
1900
client_config, section)))
1900
1901
for section in client_config.sections()))
1901
1902
if not tcp_server.clients:
1902
logger.warning(u"No clients defined")
1903
logger.warning("No clients defined")
1903
1904
1904
1905
if not debug:
1905
1906
try:
1906
1907
with pidfile:
1907
1908
pid = os.getpid()
1908
pidfile.write(str(pid) + "\n")
1909
pidfile.write(str(pid) + "\n".encode("utf-8"))
1909
1910
del pidfile
1910
1911
except IOError:
1911
logger.error(u"Could not write to file %r with PID %d",
1912
logger.error("Could not write to file %r with PID %d",
1912
1913
pidfilename, pid)
1913
1914
except NameError:
1914
1915
# "pidfile" was never created
1924
1925
class MandosDBusService(dbus.service.Object):
1925
1926
"""A D-Bus proxy object"""
1926
1927
def __init__(self):
1927
dbus.service.Object.__init__(self, bus, u"/")
1928
_interface = u"se.bsnet.fukt.Mandos"
1928
dbus.service.Object.__init__(self, bus, "/")
1929
_interface = "se.bsnet.fukt.Mandos"
1929
1930
1930
@dbus.service.signal(_interface, signature=u"o")
1931
@dbus.service.signal(_interface, signature="o")
1931
1932
def ClientAdded(self, objpath):
1932
1933
"D-Bus signal"
1933
1934
pass
1934
1935
1935
@dbus.service.signal(_interface, signature=u"ss")
1936
@dbus.service.signal(_interface, signature="ss")
1936
1937
def ClientNotFound(self, fingerprint, address):
1937
1938
"D-Bus signal"
1938
1939
pass
1939
1940
1940
@dbus.service.signal(_interface, signature=u"os")
1941
@dbus.service.signal(_interface, signature="os")
1941
1942
def ClientRemoved(self, objpath, name):
1942
1943
"D-Bus signal"
1943
1944
pass
1944
1945
1945
@dbus.service.method(_interface, out_signature=u"ao")
1946
@dbus.service.method(_interface, out_signature="ao")
1946
1947
def GetAllClients(self):
1947
1948
"D-Bus method"
1948
1949
return dbus.Array(c.dbus_object_path
1949
1950
for c in tcp_server.clients)
1950
1951
1951
1952
@dbus.service.method(_interface,
1952
out_signature=u"a{oa{sv}}")
1953
out_signature="a{oa{sv}}")
1953
1954
def GetAllClientsWithProperties(self):
1954
1955
"D-Bus method"
1955
1956
return dbus.Dictionary(
1956
((c.dbus_object_path, c.GetAll(u""))
1957
((c.dbus_object_path, c.GetAll(""))
1957
1958
for c in tcp_server.clients),
1958
signature=u"oa{sv}")
1959
signature="oa{sv}")
1959
1960
1960
@dbus.service.method(_interface, in_signature=u"o")
1961
@dbus.service.method(_interface, in_signature="o")
1961
1962
def RemoveClient(self, object_path):
1962
1963
"D-Bus method"
1963
1964
for c in tcp_server.clients:
2005
2006
# Find out what port we got
2006
2007
service.port = tcp_server.socket.getsockname()[1]
2007
2008
if use_ipv6:
2008
logger.info(u"Now listening on address %r, port %d,"
2009
logger.info("Now listening on address %r, port %d,"
2009
2010
" flowinfo %d, scope_id %d"
2010
2011
% tcp_server.socket.getsockname())
2011
2012
else: # IPv4
2012
logger.info(u"Now listening on address %r, port %d"
2013
logger.info("Now listening on address %r, port %d"
2013
2014
% tcp_server.socket.getsockname())
2014
2015
2015
2016
#service.interface = tcp_server.socket.getsockname()[3]
2019
2020
try:
2020
2021
service.activate()
2021
2022
except dbus.exceptions.DBusException, error:
2022
logger.critical(u"DBusException: %s", error)
2023
logger.critical("DBusException: %s", error)
2023
2024
cleanup()
2024
2025
sys.exit(1)
2025
2026
# End of Avahi example code
2029
2030
(tcp_server.handle_request
2030
2031
(*args[2:], **kwargs) or True))
2031
2032
2032
logger.debug(u"Starting main loop")
2033
logger.debug("Starting main loop")
2033
2034
main_loop.run()
2034
2035
except AvahiError, error:
2035
logger.critical(u"AvahiError: %s", error)
2036
logger.critical("AvahiError: %s", error)
2036
2037
cleanup()
2037
2038
sys.exit(1)
2038
2039
except KeyboardInterrupt:
2039
2040
if debug:
2040
print >> sys.stderr
2041
logger.debug(u"Server received KeyboardInterrupt")
2042
logger.debug(u"Server exiting")
2041
print("", file=sys.stderr)
2042
logger.debug("Server received KeyboardInterrupt")
2043
logger.debug("Server exiting")
2043
2044
# Must run before the D-Bus bus name gets deregistered
2044
2045
cleanup()
2045
2046
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0