150
152
self.group = None # our entry group
151
153
self.server = None
155
self.entry_group_state_changed_match = None
153
156
def rename(self):
154
157
"""Derived from the Avahi example code"""
155
158
if self.rename_count >= self.max_renames:
156
logger.critical(u"No suitable Zeroconf service name found"
157
u" after %i retries, exiting.",
159
logger.critical("No suitable Zeroconf service name found"
160
" after %i retries, exiting.",
158
161
self.rename_count)
159
raise AvahiServiceError(u"Too many renames")
160
self.name = unicode(self.server.GetAlternativeServiceName(self.name))
161
logger.info(u"Changing Zeroconf service name to %r ...",
162
raise AvahiServiceError("Too many renames")
163
self.name = unicode(self.server
164
.GetAlternativeServiceName(self.name))
165
logger.info("Changing Zeroconf service name to %r ...",
163
167
syslogger.setFormatter(logging.Formatter
164
(u'Mandos (%s) [%%(process)d]:'
165
u' %%(levelname)s: %%(message)s'
168
('Mandos (%s) [%%(process)d]:'
169
' %%(levelname)s: %%(message)s'
170
except dbus.exceptions.DBusException, error:
171
logger.critical(u"DBusException: %s", error)
174
except dbus.exceptions.DBusException as error:
175
logger.critical("DBusException: %s", error)
174
178
self.rename_count += 1
175
179
def remove(self):
176
180
"""Derived from the Avahi example code"""
181
if self.entry_group_state_changed_match is not None:
182
self.entry_group_state_changed_match.remove()
183
self.entry_group_state_changed_match = None
177
184
if self.group is not None:
178
185
self.group.Reset()
180
187
"""Derived from the Avahi example code"""
181
189
if self.group is None:
182
190
self.group = dbus.Interface(
183
191
self.bus.get_object(avahi.DBUS_NAME,
184
192
self.server.EntryGroupNew()),
185
193
avahi.DBUS_INTERFACE_ENTRY_GROUP)
186
self.group.connect_to_signal('StateChanged',
188
.entry_group_state_changed)
189
logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
194
self.entry_group_state_changed_match = (
195
self.group.connect_to_signal(
196
'StateChanged', self .entry_group_state_changed))
197
logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
190
198
self.name, self.type)
191
199
self.group.AddService(
199
207
self.group.Commit()
200
208
def entry_group_state_changed(self, state, error):
201
209
"""Derived from the Avahi example code"""
202
logger.debug(u"Avahi entry group state change: %i", state)
210
logger.debug("Avahi entry group state change: %i", state)
204
212
if state == avahi.ENTRY_GROUP_ESTABLISHED:
205
logger.debug(u"Zeroconf service established.")
213
logger.debug("Zeroconf service established.")
206
214
elif state == avahi.ENTRY_GROUP_COLLISION:
207
logger.warning(u"Zeroconf service name collision.")
215
logger.info("Zeroconf service name collision.")
209
217
elif state == avahi.ENTRY_GROUP_FAILURE:
210
logger.critical(u"Avahi: Error in group state changed %s",
218
logger.critical("Avahi: Error in group state changed %s",
212
raise AvahiGroupError(u"State changed: %s"
220
raise AvahiGroupError("State changed: %s"
213
221
% unicode(error))
214
222
def cleanup(self):
215
223
"""Derived from the Avahi example code"""
216
224
if self.group is not None:
227
except (dbus.exceptions.UnknownMethodException,
228
dbus.exceptions.DBusException) as e:
218
230
self.group = None
219
def server_state_changed(self, state):
232
def server_state_changed(self, state, error=None):
220
233
"""Derived from the Avahi example code"""
221
logger.debug(u"Avahi server state change: %i", state)
222
if state == avahi.SERVER_COLLISION:
223
logger.error(u"Zeroconf server name collision")
234
logger.debug("Avahi server state change: %i", state)
235
bad_states = { avahi.SERVER_INVALID:
236
"Zeroconf server invalid",
237
avahi.SERVER_REGISTERING: None,
238
avahi.SERVER_COLLISION:
239
"Zeroconf server name collision",
240
avahi.SERVER_FAILURE:
241
"Zeroconf server failure" }
242
if state in bad_states:
243
if bad_states[state] is not None:
245
logger.error(bad_states[state])
247
logger.error(bad_states[state] + ": %r", error)
225
249
elif state == avahi.SERVER_RUNNING:
253
logger.debug("Unknown state: %r", state)
255
logger.debug("Unknown state: %r: %r", state, error)
227
256
def activate(self):
228
257
"""Derived from the Avahi example code"""
229
258
if self.server is None:
230
259
self.server = dbus.Interface(
231
260
self.bus.get_object(avahi.DBUS_NAME,
232
avahi.DBUS_PATH_SERVER),
261
avahi.DBUS_PATH_SERVER,
262
follow_name_owner_changes=True),
233
263
avahi.DBUS_INTERFACE_SERVER)
234
self.server.connect_to_signal(u"StateChanged",
264
self.server.connect_to_signal("StateChanged",
235
265
self.server_state_changed)
236
266
self.server_state_changed(self.server.GetState())
269
def _timedelta_to_milliseconds(td):
270
"Convert a datetime.timedelta() to milliseconds"
271
return ((td.days * 24 * 60 * 60 * 1000)
272
+ (td.seconds * 1000)
273
+ (td.microseconds // 1000))
239
275
class Client(object):
240
276
"""A representation of a client host served by this server.
268
305
secret: bytestring; sent verbatim (over TLS) to client
269
306
timeout: datetime.timedelta(); How long from last_checked_ok
270
307
until this client is disabled
308
extended_timeout: extra long timeout when password has been sent
271
309
runtime_expansions: Allowed attributes for runtime expansion.
310
expires: datetime.datetime(); time (UTC) when a client will be
274
runtime_expansions = (u"approval_delay", u"approval_duration",
275
u"created", u"enabled", u"fingerprint",
276
u"host", u"interval", u"last_checked_ok",
277
u"last_enabled", u"name", u"timeout")
280
def _timedelta_to_milliseconds(td):
281
"Convert a datetime.timedelta() to milliseconds"
282
return ((td.days * 24 * 60 * 60 * 1000)
283
+ (td.seconds * 1000)
284
+ (td.microseconds // 1000))
314
runtime_expansions = ("approval_delay", "approval_duration",
315
"created", "enabled", "fingerprint",
316
"host", "interval", "last_checked_ok",
317
"last_enabled", "name", "timeout")
286
319
def timeout_milliseconds(self):
287
320
"Return the 'timeout' attribute in milliseconds"
288
return self._timedelta_to_milliseconds(self.timeout)
321
return _timedelta_to_milliseconds(self.timeout)
323
def extended_timeout_milliseconds(self):
324
"Return the 'extended_timeout' attribute in milliseconds"
325
return _timedelta_to_milliseconds(self.extended_timeout)
290
327
def interval_milliseconds(self):
291
328
"Return the 'interval' attribute in milliseconds"
292
return self._timedelta_to_milliseconds(self.interval)
329
return _timedelta_to_milliseconds(self.interval)
294
331
def approval_delay_milliseconds(self):
295
return self._timedelta_to_milliseconds(self.approval_delay)
332
return _timedelta_to_milliseconds(self.approval_delay)
297
334
def __init__(self, name = None, disable_hook=None, config=None):
298
335
"""Note: the 'checker' key in 'config' sets the
302
339
if config is None:
304
logger.debug(u"Creating client %r", self.name)
341
logger.debug("Creating client %r", self.name)
305
342
# Uppercase and remove spaces from fingerprint for later
306
343
# comparison purposes with return value from the fingerprint()
308
self.fingerprint = (config[u"fingerprint"].upper()
310
logger.debug(u" Fingerprint: %s", self.fingerprint)
311
if u"secret" in config:
312
self.secret = config[u"secret"].decode(u"base64")
313
elif u"secfile" in config:
345
self.fingerprint = (config["fingerprint"].upper()
347
logger.debug(" Fingerprint: %s", self.fingerprint)
348
if "secret" in config:
349
self.secret = config["secret"].decode("base64")
350
elif "secfile" in config:
314
351
with open(os.path.expanduser(os.path.expandvars
315
(config[u"secfile"])),
352
(config["secfile"])),
316
353
"rb") as secfile:
317
354
self.secret = secfile.read()
319
raise TypeError(u"No secret or secfile for client %s"
356
raise TypeError("No secret or secfile for client %s"
321
self.host = config.get(u"host", u"")
358
self.host = config.get("host", "")
322
359
self.created = datetime.datetime.utcnow()
323
360
self.enabled = False
361
self.last_approval_request = None
324
362
self.last_enabled = None
325
363
self.last_checked_ok = None
326
self.timeout = string_to_delta(config[u"timeout"])
327
self.interval = string_to_delta(config[u"interval"])
364
self.timeout = string_to_delta(config["timeout"])
365
self.extended_timeout = string_to_delta(config
366
["extended_timeout"])
367
self.interval = string_to_delta(config["interval"])
328
368
self.disable_hook = disable_hook
329
369
self.checker = None
330
370
self.checker_initiator_tag = None
331
371
self.disable_initiator_tag = None
332
373
self.checker_callback_tag = None
333
self.checker_command = config[u"checker"]
374
self.checker_command = config["checker"]
334
375
self.current_checker_command = None
335
376
self.last_connect = None
336
377
self._approved = None
337
self.approved_by_default = config.get(u"approved_by_default",
378
self.approved_by_default = config.get("approved_by_default",
339
380
self.approvals_pending = 0
340
381
self.approval_delay = string_to_delta(
341
config[u"approval_delay"])
382
config["approval_delay"])
342
383
self.approval_duration = string_to_delta(
343
config[u"approval_duration"])
344
self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
384
config["approval_duration"])
385
self.changedstate = (multiprocessing_manager
386
.Condition(multiprocessing_manager
346
389
def send_changedstate(self):
347
390
self.changedstate.acquire()
348
391
self.changedstate.notify_all()
349
392
self.changedstate.release()
351
394
def enable(self):
352
395
"""Start this client's checker and timeout hooks"""
353
if getattr(self, u"enabled", False):
396
if getattr(self, "enabled", False):
354
397
# Already enabled
356
399
self.send_changedstate()
357
self.last_enabled = datetime.datetime.utcnow()
358
400
# Schedule a new checker to be started an 'interval' from now,
359
401
# and every interval from then on.
360
402
self.checker_initiator_tag = (gobject.timeout_add
361
403
(self.interval_milliseconds(),
362
404
self.start_checker))
363
405
# Schedule a disable() when 'timeout' has passed
406
self.expires = datetime.datetime.utcnow() + self.timeout
364
407
self.disable_initiator_tag = (gobject.timeout_add
365
408
(self.timeout_milliseconds(),
367
410
self.enabled = True
411
self.last_enabled = datetime.datetime.utcnow()
368
412
# Also start a new checker *right now*.
369
413
self.start_checker()
400
445
if os.WIFEXITED(condition):
401
446
exitstatus = os.WEXITSTATUS(condition)
402
447
if exitstatus == 0:
403
logger.info(u"Checker for %(name)s succeeded",
448
logger.info("Checker for %(name)s succeeded",
405
450
self.checked_ok()
407
logger.info(u"Checker for %(name)s failed",
452
logger.info("Checker for %(name)s failed",
410
logger.warning(u"Checker for %(name)s crashed?",
455
logger.warning("Checker for %(name)s crashed?",
413
def checked_ok(self):
458
def checked_ok(self, timeout=None):
414
459
"""Bump up the timeout for this client.
416
461
This should only be called when the client has been seen,
465
timeout = self.timeout
419
466
self.last_checked_ok = datetime.datetime.utcnow()
420
gobject.source_remove(self.disable_initiator_tag)
421
self.disable_initiator_tag = (gobject.timeout_add
422
(self.timeout_milliseconds(),
467
if self.disable_initiator_tag is not None:
468
gobject.source_remove(self.disable_initiator_tag)
469
if getattr(self, "enabled", False):
470
self.disable_initiator_tag = (gobject.timeout_add
471
(_timedelta_to_milliseconds
472
(timeout), self.disable))
473
self.expires = datetime.datetime.utcnow() + timeout
475
def need_approval(self):
476
self.last_approval_request = datetime.datetime.utcnow()
425
478
def start_checker(self):
426
479
"""Start a new checker subprocess if one is not running.
576
630
def _is_dbus_property(obj):
577
return getattr(obj, u"_dbus_is_property", False)
631
return getattr(obj, "_dbus_is_property", False)
579
633
def _get_all_dbus_properties(self):
580
634
"""Returns a generator of (name, attribute) pairs
582
return ((prop._dbus_name, prop)
636
return ((prop.__get__(self)._dbus_name, prop.__get__(self))
637
for cls in self.__class__.__mro__
583
638
for name, prop in
584
inspect.getmembers(self, self._is_dbus_property))
639
inspect.getmembers(cls, self._is_dbus_property))
586
641
def _get_dbus_property(self, interface_name, property_name):
587
642
"""Returns a bound method if one exists which is a D-Bus
588
643
property with the specified name and interface.
590
for name in (property_name,
591
property_name + u"_dbus_property"):
592
prop = getattr(self, name, None)
594
or not self._is_dbus_property(prop)
595
or prop._dbus_name != property_name
596
or (interface_name and prop._dbus_interface
597
and interface_name != prop._dbus_interface)):
645
for cls in self.__class__.__mro__:
646
for name, value in (inspect.getmembers
647
(cls, self._is_dbus_property)):
648
if (value._dbus_name == property_name
649
and value._dbus_interface == interface_name):
650
return value.__get__(self)
600
652
# No such property
601
raise DBusPropertyNotFound(self.dbus_object_path + u":"
602
+ interface_name + u"."
653
raise DBusPropertyNotFound(self.dbus_object_path + ":"
654
+ interface_name + "."
605
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ss",
657
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
607
659
def Get(self, interface_name, property_name):
608
660
"""Standard D-Bus property Get() method, see D-Bus standard.
610
662
prop = self._get_dbus_property(interface_name, property_name)
611
if prop._dbus_access == u"write":
663
if prop._dbus_access == "write":
612
664
raise DBusPropertyAccessException(property_name)
614
if not hasattr(value, u"variant_level"):
666
if not hasattr(value, "variant_level"):
616
668
return type(value)(value, variant_level=value.variant_level+1)
618
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ssv")
670
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
619
671
def Set(self, interface_name, property_name, value):
620
672
"""Standard D-Bus property Set() method, see D-Bus standard.
622
674
prop = self._get_dbus_property(interface_name, property_name)
623
if prop._dbus_access == u"read":
675
if prop._dbus_access == "read":
624
676
raise DBusPropertyAccessException(property_name)
625
if prop._dbus_get_args_options[u"byte_arrays"]:
677
if prop._dbus_get_args_options["byte_arrays"]:
626
678
# The byte_arrays option is not supported yet on
627
679
# signatures other than "ay".
628
if prop._dbus_signature != u"ay":
680
if prop._dbus_signature != "ay":
630
682
value = dbus.ByteArray(''.join(unichr(byte)
631
683
for byte in value))
634
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"s",
635
out_signature=u"a{sv}")
686
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
687
out_signature="a{sv}")
636
688
def GetAll(self, interface_name):
637
689
"""Standard D-Bus property GetAll() method, see D-Bus
640
692
Note: Will not include properties with access="write".
669
721
document = xml.dom.minidom.parseString(xmlstring)
670
722
def make_tag(document, name, prop):
671
e = document.createElement(u"property")
672
e.setAttribute(u"name", name)
673
e.setAttribute(u"type", prop._dbus_signature)
674
e.setAttribute(u"access", prop._dbus_access)
723
e = document.createElement("property")
724
e.setAttribute("name", name)
725
e.setAttribute("type", prop._dbus_signature)
726
e.setAttribute("access", prop._dbus_access)
676
for if_tag in document.getElementsByTagName(u"interface"):
728
for if_tag in document.getElementsByTagName("interface"):
677
729
for tag in (make_tag(document, name, prop)
679
731
in self._get_all_dbus_properties()
680
732
if prop._dbus_interface
681
== if_tag.getAttribute(u"name")):
733
== if_tag.getAttribute("name")):
682
734
if_tag.appendChild(tag)
683
735
# Add the names to the return values for the
684
736
# "org.freedesktop.DBus.Properties" methods
685
if (if_tag.getAttribute(u"name")
686
== u"org.freedesktop.DBus.Properties"):
687
for cn in if_tag.getElementsByTagName(u"method"):
688
if cn.getAttribute(u"name") == u"Get":
689
for arg in cn.getElementsByTagName(u"arg"):
690
if (arg.getAttribute(u"direction")
692
arg.setAttribute(u"name", u"value")
693
elif cn.getAttribute(u"name") == u"GetAll":
694
for arg in cn.getElementsByTagName(u"arg"):
695
if (arg.getAttribute(u"direction")
697
arg.setAttribute(u"name", u"props")
698
xmlstring = document.toxml(u"utf-8")
737
if (if_tag.getAttribute("name")
738
== "org.freedesktop.DBus.Properties"):
739
for cn in if_tag.getElementsByTagName("method"):
740
if cn.getAttribute("name") == "Get":
741
for arg in cn.getElementsByTagName("arg"):
742
if (arg.getAttribute("direction")
744
arg.setAttribute("name", "value")
745
elif cn.getAttribute("name") == "GetAll":
746
for arg in cn.getElementsByTagName("arg"):
747
if (arg.getAttribute("direction")
749
arg.setAttribute("name", "props")
750
xmlstring = document.toxml("utf-8")
699
751
document.unlink()
700
752
except (AttributeError, xml.dom.DOMException,
701
xml.parsers.expat.ExpatError), error:
702
logger.error(u"Failed to override Introspection method",
753
xml.parsers.expat.ExpatError) as error:
754
logger.error("Failed to override Introspection method",
759
def datetime_to_dbus (dt, variant_level=0):
760
"""Convert a UTC datetime.datetime() to a D-Bus type."""
762
return dbus.String("", variant_level = variant_level)
763
return dbus.String(dt.isoformat(),
764
variant_level=variant_level)
766
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
768
"""Applied to an empty subclass of a D-Bus object, this metaclass
769
will add additional D-Bus attributes matching a certain pattern.
771
def __new__(mcs, name, bases, attr):
772
# Go through all the base classes which could have D-Bus
773
# methods, signals, or properties in them
774
for base in (b for b in bases
775
if issubclass(b, dbus.service.Object)):
776
# Go though all attributes of the base class
777
for attrname, attribute in inspect.getmembers(base):
778
# Ignore non-D-Bus attributes, and D-Bus attributes
779
# with the wrong interface name
780
if (not hasattr(attribute, "_dbus_interface")
781
or not attribute._dbus_interface
782
.startswith("se.recompile.Mandos")):
784
# Create an alternate D-Bus interface name based on
786
alt_interface = (attribute._dbus_interface
787
.replace("se.recompile.Mandos",
788
"se.bsnet.fukt.Mandos"))
789
# Is this a D-Bus signal?
790
if getattr(attribute, "_dbus_is_signal", False):
791
# Extract the original non-method function by
793
nonmethod_func = (dict(
794
zip(attribute.func_code.co_freevars,
795
attribute.__closure__))["func"]
797
# Create a new, but exactly alike, function
798
# object, and decorate it to be a new D-Bus signal
799
# with the alternate D-Bus interface name
800
new_function = (dbus.service.signal
802
attribute._dbus_signature)
804
nonmethod_func.func_code,
805
nonmethod_func.func_globals,
806
nonmethod_func.func_name,
807
nonmethod_func.func_defaults,
808
nonmethod_func.func_closure)))
809
# Define a creator of a function to call both the
810
# old and new functions, so both the old and new
811
# signals gets sent when the function is called
812
def fixscope(func1, func2):
813
"""This function is a scope container to pass
814
func1 and func2 to the "call_both" function
815
outside of its arguments"""
816
def call_both(*args, **kwargs):
817
"""This function will emit two D-Bus
818
signals by calling func1 and func2"""
819
func1(*args, **kwargs)
820
func2(*args, **kwargs)
822
# Create the "call_both" function and add it to
824
attr[attrname] = fixscope(attribute,
826
# Is this a D-Bus method?
827
elif getattr(attribute, "_dbus_is_method", False):
828
# Create a new, but exactly alike, function
829
# object. Decorate it to be a new D-Bus method
830
# with the alternate D-Bus interface name. Add it
832
attr[attrname] = (dbus.service.method
834
attribute._dbus_in_signature,
835
attribute._dbus_out_signature)
837
(attribute.func_code,
838
attribute.func_globals,
840
attribute.func_defaults,
841
attribute.func_closure)))
842
# Is this a D-Bus property?
843
elif getattr(attribute, "_dbus_is_property", False):
844
# Create a new, but exactly alike, function
845
# object, and decorate it to be a new D-Bus
846
# property with the alternate D-Bus interface
847
# name. Add it to the class.
848
attr[attrname] = (dbus_service_property
850
attribute._dbus_signature,
851
attribute._dbus_access,
853
._dbus_get_args_options
856
(attribute.func_code,
857
attribute.func_globals,
859
attribute.func_defaults,
860
attribute.func_closure)))
861
return type.__new__(mcs, name, bases, attr)
707
863
class ClientDBus(Client, DBusObjectWithProperties):
708
864
"""A Client class using D-Bus
723
879
Client.__init__(self, *args, **kwargs)
724
880
# Only now, when this client is initialized, can it show up on
882
client_object_name = unicode(self.name).translate(
726
885
self.dbus_object_path = (dbus.ObjectPath
728
+ self.name.replace(u".", u"_")))
886
("/clients/" + client_object_name))
729
887
DBusObjectWithProperties.__init__(self, self.bus,
730
888
self.dbus_object_path)
732
def _get_approvals_pending(self):
733
return self._approvals_pending
734
def _set_approvals_pending(self, value):
735
old_value = self._approvals_pending
736
self._approvals_pending = value
738
if (hasattr(self, "dbus_object_path")
739
and bval is not bool(old_value)):
740
dbus_bool = dbus.Boolean(bval, variant_level=1)
741
self.PropertyChanged(dbus.String(u"ApprovalPending"),
890
def notifychangeproperty(transform_func,
891
dbus_name, type_func=lambda x: x,
893
""" Modify a variable so that it's a property which announces
744
approvals_pending = property(_get_approvals_pending,
745
_set_approvals_pending)
746
del _get_approvals_pending, _set_approvals_pending
749
def _datetime_to_dbus(dt, variant_level=0):
750
"""Convert a UTC datetime.datetime() to a D-Bus type."""
751
return dbus.String(dt.isoformat(),
752
variant_level=variant_level)
755
oldstate = getattr(self, u"enabled", False)
756
r = Client.enable(self)
757
if oldstate != self.enabled:
759
self.PropertyChanged(dbus.String(u"Enabled"),
760
dbus.Boolean(True, variant_level=1))
761
self.PropertyChanged(
762
dbus.String(u"LastEnabled"),
763
self._datetime_to_dbus(self.last_enabled,
767
def disable(self, quiet = False):
768
oldstate = getattr(self, u"enabled", False)
769
r = Client.disable(self, quiet=quiet)
770
if not quiet and oldstate != self.enabled:
772
self.PropertyChanged(dbus.String(u"Enabled"),
773
dbus.Boolean(False, variant_level=1))
896
transform_fun: Function that takes a value and a variant_level
897
and transforms it to a D-Bus type.
898
dbus_name: D-Bus name of the variable
899
type_func: Function that transform the value before sending it
900
to the D-Bus. Default: no transform
901
variant_level: D-Bus variant level. Default: 1
903
attrname = "_{0}".format(dbus_name)
904
def setter(self, value):
905
if hasattr(self, "dbus_object_path"):
906
if (not hasattr(self, attrname) or
907
type_func(getattr(self, attrname, None))
908
!= type_func(value)):
909
dbus_value = transform_func(type_func(value),
912
self.PropertyChanged(dbus.String(dbus_name),
914
setattr(self, attrname, value)
916
return property(lambda self: getattr(self, attrname), setter)
919
expires = notifychangeproperty(datetime_to_dbus, "Expires")
920
approvals_pending = notifychangeproperty(dbus.Boolean,
923
enabled = notifychangeproperty(dbus.Boolean, "Enabled")
924
last_enabled = notifychangeproperty(datetime_to_dbus,
926
checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
927
type_func = lambda checker:
929
last_checked_ok = notifychangeproperty(datetime_to_dbus,
931
last_approval_request = notifychangeproperty(
932
datetime_to_dbus, "LastApprovalRequest")
933
approved_by_default = notifychangeproperty(dbus.Boolean,
935
approval_delay = notifychangeproperty(dbus.UInt16,
938
_timedelta_to_milliseconds)
939
approval_duration = notifychangeproperty(
940
dbus.UInt16, "ApprovalDuration",
941
type_func = _timedelta_to_milliseconds)
942
host = notifychangeproperty(dbus.String, "Host")
943
timeout = notifychangeproperty(dbus.UInt16, "Timeout",
945
_timedelta_to_milliseconds)
946
extended_timeout = notifychangeproperty(
947
dbus.UInt16, "ExtendedTimeout",
948
type_func = _timedelta_to_milliseconds)
949
interval = notifychangeproperty(dbus.UInt16,
952
_timedelta_to_milliseconds)
953
checker_command = notifychangeproperty(dbus.String, "Checker")
955
del notifychangeproperty
776
957
def __del__(self, *args, **kwargs):
778
959
self.remove_from_connection()
779
960
except LookupError:
781
if hasattr(DBusObjectWithProperties, u"__del__"):
962
if hasattr(DBusObjectWithProperties, "__del__"):
782
963
DBusObjectWithProperties.__del__(self, *args, **kwargs)
783
964
Client.__del__(self, *args, **kwargs)
935
1092
# ApprovalPending - property
936
@dbus_service_property(_interface, signature=u"b", access=u"read")
1093
@dbus_service_property(_interface, signature="b", access="read")
937
1094
def ApprovalPending_dbus_property(self):
938
1095
return dbus.Boolean(bool(self.approvals_pending))
940
1097
# ApprovedByDefault - property
941
@dbus_service_property(_interface, signature=u"b",
1098
@dbus_service_property(_interface, signature="b",
943
1100
def ApprovedByDefault_dbus_property(self, value=None):
944
1101
if value is None: # get
945
1102
return dbus.Boolean(self.approved_by_default)
946
1103
self.approved_by_default = bool(value)
948
self.PropertyChanged(dbus.String(u"ApprovedByDefault"),
949
dbus.Boolean(value, variant_level=1))
951
1105
# ApprovalDelay - property
952
@dbus_service_property(_interface, signature=u"t",
1106
@dbus_service_property(_interface, signature="t",
954
1108
def ApprovalDelay_dbus_property(self, value=None):
955
1109
if value is None: # get
956
1110
return dbus.UInt64(self.approval_delay_milliseconds())
957
1111
self.approval_delay = datetime.timedelta(0, 0, 0, value)
959
self.PropertyChanged(dbus.String(u"ApprovalDelay"),
960
dbus.UInt64(value, variant_level=1))
962
1113
# ApprovalDuration - property
963
@dbus_service_property(_interface, signature=u"t",
1114
@dbus_service_property(_interface, signature="t",
965
1116
def ApprovalDuration_dbus_property(self, value=None):
966
1117
if value is None: # get
967
return dbus.UInt64(self._timedelta_to_milliseconds(
1118
return dbus.UInt64(_timedelta_to_milliseconds(
968
1119
self.approval_duration))
969
1120
self.approval_duration = datetime.timedelta(0, 0, 0, value)
971
self.PropertyChanged(dbus.String(u"ApprovalDuration"),
972
dbus.UInt64(value, variant_level=1))
974
1122
# Name - property
975
@dbus_service_property(_interface, signature=u"s", access=u"read")
1123
@dbus_service_property(_interface, signature="s", access="read")
976
1124
def Name_dbus_property(self):
977
1125
return dbus.String(self.name)
979
1127
# Fingerprint - property
980
@dbus_service_property(_interface, signature=u"s", access=u"read")
1128
@dbus_service_property(_interface, signature="s", access="read")
981
1129
def Fingerprint_dbus_property(self):
982
1130
return dbus.String(self.fingerprint)
984
1132
# Host - property
985
@dbus_service_property(_interface, signature=u"s",
1133
@dbus_service_property(_interface, signature="s",
987
1135
def Host_dbus_property(self, value=None):
988
1136
if value is None: # get
989
1137
return dbus.String(self.host)
990
1138
self.host = value
992
self.PropertyChanged(dbus.String(u"Host"),
993
dbus.String(value, variant_level=1))
995
1140
# Created - property
996
@dbus_service_property(_interface, signature=u"s", access=u"read")
1141
@dbus_service_property(_interface, signature="s", access="read")
997
1142
def Created_dbus_property(self):
998
return dbus.String(self._datetime_to_dbus(self.created))
1143
return dbus.String(datetime_to_dbus(self.created))
1000
1145
# LastEnabled - property
1001
@dbus_service_property(_interface, signature=u"s", access=u"read")
1146
@dbus_service_property(_interface, signature="s", access="read")
1002
1147
def LastEnabled_dbus_property(self):
1003
if self.last_enabled is None:
1004
return dbus.String(u"")
1005
return dbus.String(self._datetime_to_dbus(self.last_enabled))
1148
return datetime_to_dbus(self.last_enabled)
1007
1150
# Enabled - property
1008
@dbus_service_property(_interface, signature=u"b",
1009
access=u"readwrite")
1151
@dbus_service_property(_interface, signature="b",
1010
1153
def Enabled_dbus_property(self, value=None):
1011
1154
if value is None: # get
1012
1155
return dbus.Boolean(self.enabled)
1018
1161
# LastCheckedOK - property
1019
@dbus_service_property(_interface, signature=u"s",
1020
access=u"readwrite")
1162
@dbus_service_property(_interface, signature="s",
1021
1164
def LastCheckedOK_dbus_property(self, value=None):
1022
1165
if value is not None:
1023
1166
self.checked_ok()
1025
if self.last_checked_ok is None:
1026
return dbus.String(u"")
1027
return dbus.String(self._datetime_to_dbus(self
1168
return datetime_to_dbus(self.last_checked_ok)
1170
# Expires - property
1171
@dbus_service_property(_interface, signature="s", access="read")
1172
def Expires_dbus_property(self):
1173
return datetime_to_dbus(self.expires)
1175
# LastApprovalRequest - property
1176
@dbus_service_property(_interface, signature="s", access="read")
1177
def LastApprovalRequest_dbus_property(self):
1178
return datetime_to_dbus(self.last_approval_request)
1030
1180
# Timeout - property
1031
@dbus_service_property(_interface, signature=u"t",
1032
access=u"readwrite")
1181
@dbus_service_property(_interface, signature="t",
1033
1183
def Timeout_dbus_property(self, value=None):
1034
1184
if value is None: # get
1035
1185
return dbus.UInt64(self.timeout_milliseconds())
1036
1186
self.timeout = datetime.timedelta(0, 0, 0, value)
1038
self.PropertyChanged(dbus.String(u"Timeout"),
1039
dbus.UInt64(value, variant_level=1))
1040
if getattr(self, u"disable_initiator_tag", None) is None:
1187
if getattr(self, "disable_initiator_tag", None) is None:
1042
1189
# Reschedule timeout
1043
1190
gobject.source_remove(self.disable_initiator_tag)
1044
1191
self.disable_initiator_tag = None
1045
time_to_die = (self.
1046
_timedelta_to_milliseconds((self
1193
time_to_die = _timedelta_to_milliseconds((self
1051
1198
if time_to_die <= 0:
1052
1199
# The timeout has passed
1202
self.expires = (datetime.datetime.utcnow()
1203
+ datetime.timedelta(milliseconds =
1055
1205
self.disable_initiator_tag = (gobject.timeout_add
1056
1206
(time_to_die, self.disable))
1208
# ExtendedTimeout - property
1209
@dbus_service_property(_interface, signature="t",
1211
def ExtendedTimeout_dbus_property(self, value=None):
1212
if value is None: # get
1213
return dbus.UInt64(self.extended_timeout_milliseconds())
1214
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1058
1216
# Interval - property
1059
@dbus_service_property(_interface, signature=u"t",
1060
access=u"readwrite")
1217
@dbus_service_property(_interface, signature="t",
1061
1219
def Interval_dbus_property(self, value=None):
1062
1220
if value is None: # get
1063
1221
return dbus.UInt64(self.interval_milliseconds())
1064
1222
self.interval = datetime.timedelta(0, 0, 0, value)
1066
self.PropertyChanged(dbus.String(u"Interval"),
1067
dbus.UInt64(value, variant_level=1))
1068
if getattr(self, u"checker_initiator_tag", None) is None:
1223
if getattr(self, "checker_initiator_tag", None) is None:
1070
1225
# Reschedule checker run
1071
1226
gobject.source_remove(self.checker_initiator_tag)
1072
1227
self.checker_initiator_tag = (gobject.timeout_add
1073
1228
(value, self.start_checker))
1074
1229
self.start_checker() # Start one now, too
1076
1231
# Checker - property
1077
@dbus_service_property(_interface, signature=u"s",
1078
access=u"readwrite")
1232
@dbus_service_property(_interface, signature="s",
1079
1234
def Checker_dbus_property(self, value=None):
1080
1235
if value is None: # get
1081
1236
return dbus.String(self.checker_command)
1082
1237
self.checker_command = value
1084
self.PropertyChanged(dbus.String(u"Checker"),
1085
dbus.String(self.checker_command,
1088
1239
# CheckerRunning - property
1089
@dbus_service_property(_interface, signature=u"b",
1090
access=u"readwrite")
1240
@dbus_service_property(_interface, signature="b",
1091
1242
def CheckerRunning_dbus_property(self, value=None):
1092
1243
if value is None: # get
1093
1244
return dbus.Boolean(self.checker is not None)
1145
1298
def handle(self):
1146
1299
with contextlib.closing(self.server.child_pipe) as child_pipe:
1147
logger.info(u"TCP connection from: %s",
1300
logger.info("TCP connection from: %s",
1148
1301
unicode(self.client_address))
1149
logger.debug(u"Pipe FD: %d",
1302
logger.debug("Pipe FD: %d",
1150
1303
self.server.child_pipe.fileno())
1152
1305
session = (gnutls.connection
1153
1306
.ClientSession(self.request,
1154
1307
gnutls.connection
1155
1308
.X509Credentials()))
1157
1310
# Note: gnutls.connection.X509Credentials is really a
1158
1311
# generic GnuTLS certificate credentials object so long as
1159
1312
# no X.509 keys are added to it. Therefore, we can use it
1160
1313
# here despite using OpenPGP certificates.
1162
#priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
1163
# u"+AES-256-CBC", u"+SHA1",
1164
# u"+COMP-NULL", u"+CTYPE-OPENPGP",
1315
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1316
# "+AES-256-CBC", "+SHA1",
1317
# "+COMP-NULL", "+CTYPE-OPENPGP",
1166
1319
# Use a fallback default, since this MUST be set.
1167
1320
priority = self.server.gnutls_priority
1168
1321
if priority is None:
1169
priority = u"NORMAL"
1170
1323
(gnutls.library.functions
1171
1324
.gnutls_priority_set_direct(session._c_object,
1172
1325
priority, None))
1174
1327
# Start communication using the Mandos protocol
1175
1328
# Get protocol number
1176
1329
line = self.request.makefile().readline()
1177
logger.debug(u"Protocol version: %r", line)
1330
logger.debug("Protocol version: %r", line)
1179
1332
if int(line.strip().split()[0]) > 1:
1180
1333
raise RuntimeError
1181
except (ValueError, IndexError, RuntimeError), error:
1182
logger.error(u"Unknown protocol version: %s", error)
1334
except (ValueError, IndexError, RuntimeError) as error:
1335
logger.error("Unknown protocol version: %s", error)
1185
1338
# Start GnuTLS connection
1187
1340
session.handshake()
1188
except gnutls.errors.GNUTLSError, error:
1189
logger.warning(u"Handshake failed: %s", error)
1341
except gnutls.errors.GNUTLSError as error:
1342
logger.warning("Handshake failed: %s", error)
1190
1343
# Do not run session.bye() here: the session is not
1191
1344
# established. Just abandon the request.
1193
logger.debug(u"Handshake succeeded")
1346
logger.debug("Handshake succeeded")
1195
1348
approval_required = False
1198
1351
fpr = self.fingerprint(self.peer_certificate
1200
except (TypeError, gnutls.errors.GNUTLSError), error:
1201
logger.warning(u"Bad certificate: %s", error)
1354
gnutls.errors.GNUTLSError) as error:
1355
logger.warning("Bad certificate: %s", error)
1203
logger.debug(u"Fingerprint: %s", fpr)
1357
logger.debug("Fingerprint: %s", fpr)
1206
1360
client = ProxyClient(child_pipe, fpr,
1207
1361
self.client_address)
1474
1634
def server_activate(self):
1475
1635
if self.enabled:
1476
1636
return socketserver.TCPServer.server_activate(self)
1477
1638
def enable(self):
1478
1639
self.enabled = True
1479
def add_pipe(self, parent_pipe):
1641
def add_pipe(self, parent_pipe, proc):
1480
1642
# Call "handle_ipc" for both data and EOF events
1481
1643
gobject.io_add_watch(parent_pipe.fileno(),
1482
1644
gobject.IO_IN | gobject.IO_HUP,
1483
1645
functools.partial(self.handle_ipc,
1484
parent_pipe = parent_pipe))
1486
1650
def handle_ipc(self, source, condition, parent_pipe=None,
1487
client_object=None):
1651
proc = None, client_object=None):
1488
1652
condition_names = {
1489
gobject.IO_IN: u"IN", # There is data to read.
1490
gobject.IO_OUT: u"OUT", # Data can be written (without
1653
gobject.IO_IN: "IN", # There is data to read.
1654
gobject.IO_OUT: "OUT", # Data can be written (without
1492
gobject.IO_PRI: u"PRI", # There is urgent data to read.
1493
gobject.IO_ERR: u"ERR", # Error condition.
1494
gobject.IO_HUP: u"HUP" # Hung up (the connection has been
1656
gobject.IO_PRI: "PRI", # There is urgent data to read.
1657
gobject.IO_ERR: "ERR", # Error condition.
1658
gobject.IO_HUP: "HUP" # Hung up (the connection has been
1495
1659
# broken, usually for pipes and
1519
logger.warning(u"Client not found for fingerprint: %s, ad"
1520
u"dress: %s", fpr, address)
1685
logger.info("Client not found for fingerprint: %s, ad"
1686
"dress: %s", fpr, address)
1521
1687
if self.use_dbus:
1522
1688
# Emit D-Bus signal
1523
mandos_dbus_service.ClientNotFound(fpr, address)
1689
mandos_dbus_service.ClientNotFound(fpr,
1524
1691
parent_pipe.send(False)
1527
1694
gobject.io_add_watch(parent_pipe.fileno(),
1528
1695
gobject.IO_IN | gobject.IO_HUP,
1529
1696
functools.partial(self.handle_ipc,
1530
parent_pipe = parent_pipe,
1531
client_object = client))
1532
1702
parent_pipe.send(True)
1533
# remove the old hook in favor of the new above hook on same fileno
1703
# remove the old hook in favor of the new above hook on
1535
1706
if command == 'funcall':
1536
1707
funcname = request[1]
1537
1708
args = request[2]
1538
1709
kwargs = request[3]
1540
parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
1711
parent_pipe.send(('data', getattr(client_object,
1542
1715
if command == 'getattr':
1543
1716
attrname = request[1]
1544
1717
if callable(client_object.__getattribute__(attrname)):
1545
1718
parent_pipe.send(('function',))
1547
parent_pipe.send(('data', client_object.__getattribute__(attrname)))
1720
parent_pipe.send(('data', client_object
1721
.__getattribute__(attrname)))
1549
1723
if command == 'setattr':
1550
1724
attrname = request[1]
1551
1725
value = request[2]
1552
1726
setattr(client_object, attrname, value)
1557
1731
def string_to_delta(interval):
1558
1732
"""Parse a string and return a datetime.timedelta
1560
>>> string_to_delta(u'7d')
1734
>>> string_to_delta('7d')
1561
1735
datetime.timedelta(7)
1562
>>> string_to_delta(u'60s')
1736
>>> string_to_delta('60s')
1563
1737
datetime.timedelta(0, 60)
1564
>>> string_to_delta(u'60m')
1738
>>> string_to_delta('60m')
1565
1739
datetime.timedelta(0, 3600)
1566
>>> string_to_delta(u'24h')
1740
>>> string_to_delta('24h')
1567
1741
datetime.timedelta(1)
1568
>>> string_to_delta(u'1w')
1742
>>> string_to_delta('1w')
1569
1743
datetime.timedelta(7)
1570
>>> string_to_delta(u'5m 30s')
1744
>>> string_to_delta('5m 30s')
1571
1745
datetime.timedelta(0, 330)
1573
1747
timevalue = datetime.timedelta(0)
1647
1821
##################################################################
1648
1822
# Parsing of options, both command line and config file
1650
parser = optparse.OptionParser(version = "%%prog %s" % version)
1651
parser.add_option("-i", u"--interface", type=u"string",
1652
metavar="IF", help=u"Bind to interface IF")
1653
parser.add_option("-a", u"--address", type=u"string",
1654
help=u"Address to listen for requests on")
1655
parser.add_option("-p", u"--port", type=u"int",
1656
help=u"Port number to receive requests on")
1657
parser.add_option("--check", action=u"store_true",
1658
help=u"Run self-test")
1659
parser.add_option("--debug", action=u"store_true",
1660
help=u"Debug mode; run in foreground and log to"
1662
parser.add_option("--debuglevel", type=u"string", metavar="Level",
1663
help=u"Debug level for stdout output")
1664
parser.add_option("--priority", type=u"string", help=u"GnuTLS"
1665
u" priority string (see GnuTLS documentation)")
1666
parser.add_option("--servicename", type=u"string",
1667
metavar=u"NAME", help=u"Zeroconf service name")
1668
parser.add_option("--configdir", type=u"string",
1669
default=u"/etc/mandos", metavar=u"DIR",
1670
help=u"Directory to search for configuration"
1672
parser.add_option("--no-dbus", action=u"store_false",
1673
dest=u"use_dbus", help=u"Do not provide D-Bus"
1674
u" system bus interface")
1675
parser.add_option("--no-ipv6", action=u"store_false",
1676
dest=u"use_ipv6", help=u"Do not use IPv6")
1677
options = parser.parse_args()[0]
1824
parser = argparse.ArgumentParser()
1825
parser.add_argument("-v", "--version", action="version",
1826
version = "%%(prog)s %s" % version,
1827
help="show version number and exit")
1828
parser.add_argument("-i", "--interface", metavar="IF",
1829
help="Bind to interface IF")
1830
parser.add_argument("-a", "--address",
1831
help="Address to listen for requests on")
1832
parser.add_argument("-p", "--port", type=int,
1833
help="Port number to receive requests on")
1834
parser.add_argument("--check", action="store_true",
1835
help="Run self-test")
1836
parser.add_argument("--debug", action="store_true",
1837
help="Debug mode; run in foreground and log"
1839
parser.add_argument("--debuglevel", metavar="LEVEL",
1840
help="Debug level for stdout output")
1841
parser.add_argument("--priority", help="GnuTLS"
1842
" priority string (see GnuTLS documentation)")
1843
parser.add_argument("--servicename",
1844
metavar="NAME", help="Zeroconf service name")
1845
parser.add_argument("--configdir",
1846
default="/etc/mandos", metavar="DIR",
1847
help="Directory to search for configuration"
1849
parser.add_argument("--no-dbus", action="store_false",
1850
dest="use_dbus", help="Do not provide D-Bus"
1851
" system bus interface")
1852
parser.add_argument("--no-ipv6", action="store_false",
1853
dest="use_ipv6", help="Do not use IPv6")
1854
options = parser.parse_args()
1679
1856
if options.check:
1684
1861
# Default values for config file for server-global settings
1685
server_defaults = { u"interface": u"",
1690
u"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1691
u"servicename": u"Mandos",
1692
u"use_dbus": u"True",
1693
u"use_ipv6": u"True",
1862
server_defaults = { "interface": "",
1867
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1868
"servicename": "Mandos",
1697
1874
# Parse config file for server-global settings
1698
1875
server_config = configparser.SafeConfigParser(server_defaults)
1699
1876
del server_defaults
1700
1877
server_config.read(os.path.join(options.configdir,
1702
1879
# Convert the SafeConfigParser object to a dict
1703
1880
server_settings = server_config.defaults()
1704
1881
# Use the appropriate methods on the non-string config options
1705
for option in (u"debug", u"use_dbus", u"use_ipv6"):
1706
server_settings[option] = server_config.getboolean(u"DEFAULT",
1882
for option in ("debug", "use_dbus", "use_ipv6"):
1883
server_settings[option] = server_config.getboolean("DEFAULT",
1708
1885
if server_settings["port"]:
1709
server_settings["port"] = server_config.getint(u"DEFAULT",
1886
server_settings["port"] = server_config.getint("DEFAULT",
1711
1888
del server_config
1713
1890
# Override the settings from the config file with command line
1714
1891
# options, if set.
1715
for option in (u"interface", u"address", u"port", u"debug",
1716
u"priority", u"servicename", u"configdir",
1717
u"use_dbus", u"use_ipv6", u"debuglevel"):
1892
for option in ("interface", "address", "port", "debug",
1893
"priority", "servicename", "configdir",
1894
"use_dbus", "use_ipv6", "debuglevel"):
1718
1895
value = getattr(options, option)
1719
1896
if value is not None:
1720
1897
server_settings[option] = value
1728
1905
##################################################################
1730
1907
# For convenience
1731
debug = server_settings[u"debug"]
1732
debuglevel = server_settings[u"debuglevel"]
1733
use_dbus = server_settings[u"use_dbus"]
1734
use_ipv6 = server_settings[u"use_ipv6"]
1736
if server_settings[u"servicename"] != u"Mandos":
1908
debug = server_settings["debug"]
1909
debuglevel = server_settings["debuglevel"]
1910
use_dbus = server_settings["use_dbus"]
1911
use_ipv6 = server_settings["use_ipv6"]
1913
if server_settings["servicename"] != "Mandos":
1737
1914
syslogger.setFormatter(logging.Formatter
1738
(u'Mandos (%s) [%%(process)d]:'
1739
u' %%(levelname)s: %%(message)s'
1740
% server_settings[u"servicename"]))
1915
('Mandos (%s) [%%(process)d]:'
1916
' %%(levelname)s: %%(message)s'
1917
% server_settings["servicename"]))
1742
1919
# Parse config file with clients
1743
client_defaults = { u"timeout": u"1h",
1745
u"checker": u"fping -q -- %%(host)s",
1747
u"approval_delay": u"0s",
1748
u"approval_duration": u"1s",
1920
client_defaults = { "timeout": "5m",
1921
"extended_timeout": "15m",
1923
"checker": "fping -q -- %%(host)s",
1925
"approval_delay": "0s",
1926
"approval_duration": "1s",
1750
1928
client_config = configparser.SafeConfigParser(client_defaults)
1751
client_config.read(os.path.join(server_settings[u"configdir"],
1929
client_config.read(os.path.join(server_settings["configdir"],
1754
1932
global mandos_dbus_service
1755
1933
mandos_dbus_service = None
1757
tcp_server = MandosServer((server_settings[u"address"],
1758
server_settings[u"port"]),
1935
tcp_server = MandosServer((server_settings["address"],
1936
server_settings["port"]),
1760
interface=(server_settings[u"interface"]
1938
interface=(server_settings["interface"]
1762
1940
use_ipv6=use_ipv6,
1763
1941
gnutls_priority=
1764
server_settings[u"priority"],
1942
server_settings["priority"],
1765
1943
use_dbus=use_dbus)
1767
pidfilename = u"/var/run/mandos.pid"
1945
pidfilename = "/var/run/mandos.pid"
1769
pidfile = open(pidfilename, u"w")
1947
pidfile = open(pidfilename, "w")
1770
1948
except IOError:
1771
logger.error(u"Could not open file %r", pidfilename)
1949
logger.error("Could not open file %r", pidfilename)
1774
uid = pwd.getpwnam(u"_mandos").pw_uid
1775
gid = pwd.getpwnam(u"_mandos").pw_gid
1952
uid = pwd.getpwnam("_mandos").pw_uid
1953
gid = pwd.getpwnam("_mandos").pw_gid
1776
1954
except KeyError:
1778
uid = pwd.getpwnam(u"mandos").pw_uid
1779
gid = pwd.getpwnam(u"mandos").pw_gid
1956
uid = pwd.getpwnam("mandos").pw_uid
1957
gid = pwd.getpwnam("mandos").pw_gid
1780
1958
except KeyError:
1782
uid = pwd.getpwnam(u"nobody").pw_uid
1783
gid = pwd.getpwnam(u"nobody").pw_gid
1960
uid = pwd.getpwnam("nobody").pw_uid
1961
gid = pwd.getpwnam("nobody").pw_gid
1784
1962
except KeyError:
1790
except OSError, error:
1968
except OSError as error:
1791
1969
if error[0] != errno.EPERM:
1831
2013
# End of Avahi example code
1834
bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos",
2016
bus_name = dbus.service.BusName("se.recompile.Mandos",
1835
2017
bus, do_not_queue=True)
1836
except dbus.exceptions.NameExistsException, e:
1837
logger.error(unicode(e) + u", disabling D-Bus")
2018
old_bus_name = (dbus.service.BusName
2019
("se.bsnet.fukt.Mandos", bus,
2021
except dbus.exceptions.NameExistsException as e:
2022
logger.error(unicode(e) + ", disabling D-Bus")
1838
2023
use_dbus = False
1839
server_settings[u"use_dbus"] = False
2024
server_settings["use_dbus"] = False
1840
2025
tcp_server.use_dbus = False
1841
2026
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1842
service = AvahiService(name = server_settings[u"servicename"],
1843
servicetype = u"_mandos._tcp",
2027
service = AvahiService(name = server_settings["servicename"],
2028
servicetype = "_mandos._tcp",
1844
2029
protocol = protocol, bus = bus)
1845
2030
if server_settings["interface"]:
1846
2031
service.interface = (if_nametoindex
1847
(str(server_settings[u"interface"])))
1850
# Close all input and output, do double fork, etc.
2032
(str(server_settings["interface"])))
1853
2034
global multiprocessing_manager
1854
2035
multiprocessing_manager = multiprocessing.Manager()
1856
2037
client_class = Client
1858
client_class = functools.partial(ClientDBus, bus = bus)
2039
client_class = functools.partial(ClientDBusTransitional,
1859
2041
def client_config_items(config, section):
1860
2042
special_settings = {
1861
2043
"approved_by_default":
1899
2081
class MandosDBusService(dbus.service.Object):
1900
2082
"""A D-Bus proxy object"""
1901
2083
def __init__(self):
1902
dbus.service.Object.__init__(self, bus, u"/")
1903
_interface = u"se.bsnet.fukt.Mandos"
2084
dbus.service.Object.__init__(self, bus, "/")
2085
_interface = "se.recompile.Mandos"
1905
@dbus.service.signal(_interface, signature=u"o")
2087
@dbus.service.signal(_interface, signature="o")
1906
2088
def ClientAdded(self, objpath):
1910
@dbus.service.signal(_interface, signature=u"ss")
2092
@dbus.service.signal(_interface, signature="ss")
1911
2093
def ClientNotFound(self, fingerprint, address):
1915
@dbus.service.signal(_interface, signature=u"os")
2097
@dbus.service.signal(_interface, signature="os")
1916
2098
def ClientRemoved(self, objpath, name):
1920
@dbus.service.method(_interface, out_signature=u"ao")
2102
@dbus.service.method(_interface, out_signature="ao")
1921
2103
def GetAllClients(self):
1923
2105
return dbus.Array(c.dbus_object_path
1924
2106
for c in tcp_server.clients)
1926
2108
@dbus.service.method(_interface,
1927
out_signature=u"a{oa{sv}}")
2109
out_signature="a{oa{sv}}")
1928
2110
def GetAllClientsWithProperties(self):
1930
2112
return dbus.Dictionary(
1931
((c.dbus_object_path, c.GetAll(u""))
2113
((c.dbus_object_path, c.GetAll(""))
1932
2114
for c in tcp_server.clients),
1933
signature=u"oa{sv}")
1935
@dbus.service.method(_interface, in_signature=u"o")
2117
@dbus.service.method(_interface, in_signature="o")
1936
2118
def RemoveClient(self, object_path):
1938
2120
for c in tcp_server.clients: