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.
243
name: string; from the config file, used in log messages and
279
_approved: bool(); 'None' if not yet approved/disapproved
280
approval_delay: datetime.timedelta(); Time to wait for approval
281
approval_duration: datetime.timedelta(); Duration of one approval
282
checker: subprocess.Popen(); a running checker process used
283
to see if the client lives.
284
'None' if no process is running.
285
checker_callback_tag: a gobject event source tag, or None
286
checker_command: string; External command which is run to check
287
if client lives. %() expansions are done at
288
runtime with vars(self) as dict, so that for
289
instance %(name)s can be used in the command.
290
checker_initiator_tag: a gobject event source tag, or None
291
created: datetime.datetime(); (UTC) object creation
292
current_checker_command: string; current running checker_command
293
disable_hook: If set, called by disable() as disable_hook(self)
294
disable_initiator_tag: a gobject event source tag, or None
245
296
fingerprint: string (40 or 32 hexadecimal digits); used to
246
297
uniquely identify the client
247
secret: bytestring; sent verbatim (over TLS) to client
248
298
host: string; available for use by the checker command
249
created: datetime.datetime(); (UTC) object creation
299
interval: datetime.timedelta(); How often to start a new checker
300
last_approval_request: datetime.datetime(); (UTC) or None
301
last_checked_ok: datetime.datetime(); (UTC) or None
250
302
last_enabled: datetime.datetime(); (UTC)
252
last_checked_ok: datetime.datetime(); (UTC) or None
303
name: string; from the config file, used in log messages and
305
secret: bytestring; sent verbatim (over TLS) to client
253
306
timeout: datetime.timedelta(); How long from last_checked_ok
254
307
until this client is disabled
255
interval: datetime.timedelta(); How often to start a new checker
256
disable_hook: If set, called by disable() as disable_hook(self)
257
checker: subprocess.Popen(); a running checker process used
258
to see if the client lives.
259
'None' if no process is running.
260
checker_initiator_tag: a gobject event source tag, or None
261
disable_initiator_tag: - '' -
262
checker_callback_tag: - '' -
263
checker_command: string; External command which is run to check if
264
client lives. %() expansions are done at
265
runtime with vars(self) as dict, so that for
266
instance %(name)s can be used in the command.
267
current_checker_command: string; current running checker_command
268
approved_delay: datetime.timedelta(); Time to wait for approval
269
_approved: bool(); 'None' if not yet approved/disapproved
270
approved_duration: datetime.timedelta(); Duration of one approval
308
extended_timeout: extra long timeout when password has been sent
309
runtime_expansions: Allowed attributes for runtime expansion.
310
expires: datetime.datetime(); time (UTC) when a client will be
274
def _timedelta_to_milliseconds(td):
275
"Convert a datetime.timedelta() to milliseconds"
276
return ((td.days * 24 * 60 * 60 * 1000)
277
+ (td.seconds * 1000)
278
+ (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")
280
319
def timeout_milliseconds(self):
281
320
"Return the 'timeout' attribute in milliseconds"
282
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)
284
327
def interval_milliseconds(self):
285
328
"Return the 'interval' attribute in milliseconds"
286
return self._timedelta_to_milliseconds(self.interval)
288
def approved_delay_milliseconds(self):
289
return self._timedelta_to_milliseconds(self.approved_delay)
329
return _timedelta_to_milliseconds(self.interval)
331
def approval_delay_milliseconds(self):
332
return _timedelta_to_milliseconds(self.approval_delay)
291
334
def __init__(self, name = None, disable_hook=None, config=None):
292
335
"""Note: the 'checker' key in 'config' sets the
296
339
if config is None:
298
logger.debug(u"Creating client %r", self.name)
341
logger.debug("Creating client %r", self.name)
299
342
# Uppercase and remove spaces from fingerprint for later
300
343
# comparison purposes with return value from the fingerprint()
302
self.fingerprint = (config[u"fingerprint"].upper()
304
logger.debug(u" Fingerprint: %s", self.fingerprint)
305
if u"secret" in config:
306
self.secret = config[u"secret"].decode(u"base64")
307
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:
308
351
with open(os.path.expanduser(os.path.expandvars
309
(config[u"secfile"])),
352
(config["secfile"])),
310
353
"rb") as secfile:
311
354
self.secret = secfile.read()
313
raise TypeError(u"No secret or secfile for client %s"
356
raise TypeError("No secret or secfile for client %s"
315
self.host = config.get(u"host", u"")
358
self.host = config.get("host", "")
316
359
self.created = datetime.datetime.utcnow()
317
360
self.enabled = False
361
self.last_approval_request = None
318
362
self.last_enabled = None
319
363
self.last_checked_ok = None
320
self.timeout = string_to_delta(config[u"timeout"])
321
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"])
322
368
self.disable_hook = disable_hook
323
369
self.checker = None
324
370
self.checker_initiator_tag = None
325
371
self.disable_initiator_tag = None
326
373
self.checker_callback_tag = None
327
self.checker_command = config[u"checker"]
374
self.checker_command = config["checker"]
328
375
self.current_checker_command = None
329
376
self.last_connect = None
330
377
self._approved = None
331
self.approved_by_default = config.get(u"approved_by_default",
378
self.approved_by_default = config.get("approved_by_default",
333
380
self.approvals_pending = 0
334
self.approved_delay = string_to_delta(
335
config[u"approved_delay"])
336
self.approved_duration = string_to_delta(
337
config[u"approved_duration"])
338
self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
381
self.approval_delay = string_to_delta(
382
config["approval_delay"])
383
self.approval_duration = string_to_delta(
384
config["approval_duration"])
385
self.changedstate = (multiprocessing_manager
386
.Condition(multiprocessing_manager
340
389
def send_changedstate(self):
341
390
self.changedstate.acquire()
342
391
self.changedstate.notify_all()
343
392
self.changedstate.release()
345
394
def enable(self):
346
395
"""Start this client's checker and timeout hooks"""
347
if getattr(self, u"enabled", False):
396
if getattr(self, "enabled", False):
348
397
# Already enabled
350
399
self.send_changedstate()
351
self.last_enabled = datetime.datetime.utcnow()
352
400
# Schedule a new checker to be started an 'interval' from now,
353
401
# and every interval from then on.
354
402
self.checker_initiator_tag = (gobject.timeout_add
355
403
(self.interval_milliseconds(),
356
404
self.start_checker))
357
405
# Schedule a disable() when 'timeout' has passed
406
self.expires = datetime.datetime.utcnow() + self.timeout
358
407
self.disable_initiator_tag = (gobject.timeout_add
359
408
(self.timeout_milliseconds(),
361
410
self.enabled = True
411
self.last_enabled = datetime.datetime.utcnow()
362
412
# Also start a new checker *right now*.
363
413
self.start_checker()
568
628
def _is_dbus_property(obj):
569
return getattr(obj, u"_dbus_is_property", False)
629
return getattr(obj, "_dbus_is_property", False)
571
631
def _get_all_dbus_properties(self):
572
632
"""Returns a generator of (name, attribute) pairs
574
return ((prop._dbus_name, prop)
634
return ((prop.__get__(self)._dbus_name, prop.__get__(self))
635
for cls in self.__class__.__mro__
575
636
for name, prop in
576
inspect.getmembers(self, self._is_dbus_property))
637
inspect.getmembers(cls, self._is_dbus_property))
578
639
def _get_dbus_property(self, interface_name, property_name):
579
640
"""Returns a bound method if one exists which is a D-Bus
580
641
property with the specified name and interface.
582
for name in (property_name,
583
property_name + u"_dbus_property"):
584
prop = getattr(self, name, None)
586
or not self._is_dbus_property(prop)
587
or prop._dbus_name != property_name
588
or (interface_name and prop._dbus_interface
589
and interface_name != prop._dbus_interface)):
643
for cls in self.__class__.__mro__:
644
for name, value in (inspect.getmembers
645
(cls, self._is_dbus_property)):
646
if (value._dbus_name == property_name
647
and value._dbus_interface == interface_name):
648
return value.__get__(self)
592
650
# No such property
593
raise DBusPropertyNotFound(self.dbus_object_path + u":"
594
+ interface_name + u"."
651
raise DBusPropertyNotFound(self.dbus_object_path + ":"
652
+ interface_name + "."
597
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ss",
655
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
599
657
def Get(self, interface_name, property_name):
600
658
"""Standard D-Bus property Get() method, see D-Bus standard.
602
660
prop = self._get_dbus_property(interface_name, property_name)
603
if prop._dbus_access == u"write":
661
if prop._dbus_access == "write":
604
662
raise DBusPropertyAccessException(property_name)
606
if not hasattr(value, u"variant_level"):
664
if not hasattr(value, "variant_level"):
608
666
return type(value)(value, variant_level=value.variant_level+1)
610
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ssv")
668
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
611
669
def Set(self, interface_name, property_name, value):
612
670
"""Standard D-Bus property Set() method, see D-Bus standard.
614
672
prop = self._get_dbus_property(interface_name, property_name)
615
if prop._dbus_access == u"read":
673
if prop._dbus_access == "read":
616
674
raise DBusPropertyAccessException(property_name)
617
if prop._dbus_get_args_options[u"byte_arrays"]:
675
if prop._dbus_get_args_options["byte_arrays"]:
618
676
# The byte_arrays option is not supported yet on
619
677
# signatures other than "ay".
620
if prop._dbus_signature != u"ay":
678
if prop._dbus_signature != "ay":
622
680
value = dbus.ByteArray(''.join(unichr(byte)
623
681
for byte in value))
626
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"s",
627
out_signature=u"a{sv}")
684
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
685
out_signature="a{sv}")
628
686
def GetAll(self, interface_name):
629
687
"""Standard D-Bus property GetAll() method, see D-Bus
632
690
Note: Will not include properties with access="write".
661
719
document = xml.dom.minidom.parseString(xmlstring)
662
720
def make_tag(document, name, prop):
663
e = document.createElement(u"property")
664
e.setAttribute(u"name", name)
665
e.setAttribute(u"type", prop._dbus_signature)
666
e.setAttribute(u"access", prop._dbus_access)
721
e = document.createElement("property")
722
e.setAttribute("name", name)
723
e.setAttribute("type", prop._dbus_signature)
724
e.setAttribute("access", prop._dbus_access)
668
for if_tag in document.getElementsByTagName(u"interface"):
726
for if_tag in document.getElementsByTagName("interface"):
669
727
for tag in (make_tag(document, name, prop)
671
729
in self._get_all_dbus_properties()
672
730
if prop._dbus_interface
673
== if_tag.getAttribute(u"name")):
731
== if_tag.getAttribute("name")):
674
732
if_tag.appendChild(tag)
675
733
# Add the names to the return values for the
676
734
# "org.freedesktop.DBus.Properties" methods
677
if (if_tag.getAttribute(u"name")
678
== u"org.freedesktop.DBus.Properties"):
679
for cn in if_tag.getElementsByTagName(u"method"):
680
if cn.getAttribute(u"name") == u"Get":
681
for arg in cn.getElementsByTagName(u"arg"):
682
if (arg.getAttribute(u"direction")
684
arg.setAttribute(u"name", u"value")
685
elif cn.getAttribute(u"name") == u"GetAll":
686
for arg in cn.getElementsByTagName(u"arg"):
687
if (arg.getAttribute(u"direction")
689
arg.setAttribute(u"name", u"props")
690
xmlstring = document.toxml(u"utf-8")
735
if (if_tag.getAttribute("name")
736
== "org.freedesktop.DBus.Properties"):
737
for cn in if_tag.getElementsByTagName("method"):
738
if cn.getAttribute("name") == "Get":
739
for arg in cn.getElementsByTagName("arg"):
740
if (arg.getAttribute("direction")
742
arg.setAttribute("name", "value")
743
elif cn.getAttribute("name") == "GetAll":
744
for arg in cn.getElementsByTagName("arg"):
745
if (arg.getAttribute("direction")
747
arg.setAttribute("name", "props")
748
xmlstring = document.toxml("utf-8")
691
749
document.unlink()
692
750
except (AttributeError, xml.dom.DOMException,
693
xml.parsers.expat.ExpatError), error:
694
logger.error(u"Failed to override Introspection method",
751
xml.parsers.expat.ExpatError) as error:
752
logger.error("Failed to override Introspection method",
757
def datetime_to_dbus (dt, variant_level=0):
758
"""Convert a UTC datetime.datetime() to a D-Bus type."""
760
return dbus.String("", variant_level = variant_level)
761
return dbus.String(dt.isoformat(),
762
variant_level=variant_level)
764
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
766
"""Applied to an empty subclass of a D-Bus object, this metaclass
767
will add additional D-Bus attributes matching a certain pattern.
769
def __new__(mcs, name, bases, attr):
770
# Go through all the base classes which could have D-Bus
771
# methods, signals, or properties in them
772
for base in (b for b in bases
773
if issubclass(b, dbus.service.Object)):
774
# Go though all attributes of the base class
775
for attrname, attribute in inspect.getmembers(base):
776
# Ignore non-D-Bus attributes, and D-Bus attributes
777
# with the wrong interface name
778
if (not hasattr(attribute, "_dbus_interface")
779
or not attribute._dbus_interface
780
.startswith("se.recompile.Mandos")):
782
# Create an alternate D-Bus interface name based on
784
alt_interface = (attribute._dbus_interface
785
.replace("se.recompile.Mandos",
786
"se.bsnet.fukt.Mandos"))
787
# Is this a D-Bus signal?
788
if getattr(attribute, "_dbus_is_signal", False):
789
# Extract the original non-method function by
791
nonmethod_func = (dict(
792
zip(attribute.func_code.co_freevars,
793
attribute.__closure__))["func"]
795
# Create a new, but exactly alike, function
796
# object, and decorate it to be a new D-Bus signal
797
# with the alternate D-Bus interface name
798
new_function = (dbus.service.signal
800
attribute._dbus_signature)
802
nonmethod_func.func_code,
803
nonmethod_func.func_globals,
804
nonmethod_func.func_name,
805
nonmethod_func.func_defaults,
806
nonmethod_func.func_closure)))
807
# Define a creator of a function to call both the
808
# old and new functions, so both the old and new
809
# signals gets sent when the function is called
810
def fixscope(func1, func2):
811
"""This function is a scope container to pass
812
func1 and func2 to the "call_both" function
813
outside of its arguments"""
814
def call_both(*args, **kwargs):
815
"""This function will emit two D-Bus
816
signals by calling func1 and func2"""
817
func1(*args, **kwargs)
818
func2(*args, **kwargs)
820
# Create the "call_both" function and add it to
822
attr[attrname] = fixscope(attribute,
824
# Is this a D-Bus method?
825
elif getattr(attribute, "_dbus_is_method", False):
826
# Create a new, but exactly alike, function
827
# object. Decorate it to be a new D-Bus method
828
# with the alternate D-Bus interface name. Add it
830
attr[attrname] = (dbus.service.method
832
attribute._dbus_in_signature,
833
attribute._dbus_out_signature)
835
(attribute.func_code,
836
attribute.func_globals,
838
attribute.func_defaults,
839
attribute.func_closure)))
840
# Is this a D-Bus property?
841
elif getattr(attribute, "_dbus_is_property", False):
842
# Create a new, but exactly alike, function
843
# object, and decorate it to be a new D-Bus
844
# property with the alternate D-Bus interface
845
# name. Add it to the class.
846
attr[attrname] = (dbus_service_property
848
attribute._dbus_signature,
849
attribute._dbus_access,
851
._dbus_get_args_options
854
(attribute.func_code,
855
attribute.func_globals,
857
attribute.func_defaults,
858
attribute.func_closure)))
859
return type.__new__(mcs, name, bases, attr)
699
861
class ClientDBus(Client, DBusObjectWithProperties):
700
862
"""A Client class using D-Bus
711
877
Client.__init__(self, *args, **kwargs)
712
878
# Only now, when this client is initialized, can it show up on
880
client_object_name = unicode(self.name).translate(
714
883
self.dbus_object_path = (dbus.ObjectPath
716
+ self.name.replace(u".", u"_")))
884
("/clients/" + client_object_name))
717
885
DBusObjectWithProperties.__init__(self, self.bus,
718
886
self.dbus_object_path)
720
def _get_approvals_pending(self):
721
return self._approvals_pending
722
def _set_approvals_pending(self, value):
723
old_value = self._approvals_pending
724
self._approvals_pending = value
726
if (hasattr(self, "dbus_object_path")
727
and bval is not bool(old_value)):
728
dbus_bool = dbus.Boolean(bval, variant_level=1)
729
self.PropertyChanged(dbus.String(u"approved_pending"),
732
approvals_pending = property(_get_approvals_pending,
733
_set_approvals_pending)
734
del _get_approvals_pending, _set_approvals_pending
737
def _datetime_to_dbus(dt, variant_level=0):
738
"""Convert a UTC datetime.datetime() to a D-Bus type."""
739
return dbus.String(dt.isoformat(),
740
variant_level=variant_level)
743
oldstate = getattr(self, u"enabled", False)
744
r = Client.enable(self)
745
if oldstate != self.enabled:
747
self.PropertyChanged(dbus.String(u"enabled"),
748
dbus.Boolean(True, variant_level=1))
749
self.PropertyChanged(
750
dbus.String(u"last_enabled"),
751
self._datetime_to_dbus(self.last_enabled,
755
def disable(self, quiet = False):
756
oldstate = getattr(self, u"enabled", False)
757
r = Client.disable(self, quiet=quiet)
758
if not quiet and oldstate != self.enabled:
760
self.PropertyChanged(dbus.String(u"enabled"),
761
dbus.Boolean(False, variant_level=1))
888
def notifychangeproperty(transform_func,
889
dbus_name, type_func=lambda x: x,
891
""" Modify a variable so that it's a property which announces
894
transform_fun: Function that takes a value and transforms it
896
dbus_name: D-Bus name of the variable
897
type_func: Function that transform the value before sending it
898
to the D-Bus. Default: no transform
899
variant_level: D-Bus variant level. Default: 1
901
attrname = "_{0}".format(dbus_name)
902
def setter(self, value):
903
if hasattr(self, "dbus_object_path"):
904
if (not hasattr(self, attrname) or
905
type_func(getattr(self, attrname, None))
906
!= type_func(value)):
907
dbus_value = transform_func(type_func(value),
909
self.PropertyChanged(dbus.String(dbus_name),
911
setattr(self, attrname, value)
913
return property(lambda self: getattr(self, attrname), setter)
916
expires = notifychangeproperty(datetime_to_dbus, "Expires")
917
approvals_pending = notifychangeproperty(dbus.Boolean,
920
enabled = notifychangeproperty(dbus.Boolean, "Enabled")
921
last_enabled = notifychangeproperty(datetime_to_dbus,
923
checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
924
type_func = lambda checker:
926
last_checked_ok = notifychangeproperty(datetime_to_dbus,
928
last_approval_request = notifychangeproperty(
929
datetime_to_dbus, "LastApprovalRequest")
930
approved_by_default = notifychangeproperty(dbus.Boolean,
932
approval_delay = notifychangeproperty(dbus.UInt16,
935
_timedelta_to_milliseconds)
936
approval_duration = notifychangeproperty(
937
dbus.UInt16, "ApprovalDuration",
938
type_func = _timedelta_to_milliseconds)
939
host = notifychangeproperty(dbus.String, "Host")
940
timeout = notifychangeproperty(dbus.UInt16, "Timeout",
942
_timedelta_to_milliseconds)
943
extended_timeout = notifychangeproperty(
944
dbus.UInt16, "ExtendedTimeout",
945
type_func = _timedelta_to_milliseconds)
946
interval = notifychangeproperty(dbus.UInt16,
949
_timedelta_to_milliseconds)
950
checker_command = notifychangeproperty(dbus.String, "Checker")
952
del notifychangeproperty
764
954
def __del__(self, *args, **kwargs):
766
956
self.remove_from_connection()
767
957
except LookupError:
769
if hasattr(DBusObjectWithProperties, u"__del__"):
959
if hasattr(DBusObjectWithProperties, "__del__"):
770
960
DBusObjectWithProperties.__del__(self, *args, **kwargs)
771
961
Client.__del__(self, *args, **kwargs)
922
# approved_pending - property
923
@dbus_service_property(_interface, signature=u"b", access=u"read")
924
def approved_pending_dbus_property(self):
1089
# ApprovalPending - property
1090
@dbus_service_property(_interface, signature="b", access="read")
1091
def ApprovalPending_dbus_property(self):
925
1092
return dbus.Boolean(bool(self.approvals_pending))
927
# approved_by_default - property
928
@dbus_service_property(_interface, signature=u"b",
930
def approved_by_default_dbus_property(self):
931
return dbus.Boolean(self.approved_by_default)
933
# approved_delay - property
934
@dbus_service_property(_interface, signature=u"t",
936
def approved_delay_dbus_property(self):
937
return dbus.UInt64(self.approved_delay_milliseconds())
939
# approved_duration - property
940
@dbus_service_property(_interface, signature=u"t",
942
def approved_duration_dbus_property(self):
943
return dbus.UInt64(self._timedelta_to_milliseconds(
944
self.approved_duration))
947
@dbus_service_property(_interface, signature=u"s", access=u"read")
948
def name_dbus_property(self):
1094
# ApprovedByDefault - property
1095
@dbus_service_property(_interface, signature="b",
1097
def ApprovedByDefault_dbus_property(self, value=None):
1098
if value is None: # get
1099
return dbus.Boolean(self.approved_by_default)
1100
self.approved_by_default = bool(value)
1102
# ApprovalDelay - property
1103
@dbus_service_property(_interface, signature="t",
1105
def ApprovalDelay_dbus_property(self, value=None):
1106
if value is None: # get
1107
return dbus.UInt64(self.approval_delay_milliseconds())
1108
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1110
# ApprovalDuration - property
1111
@dbus_service_property(_interface, signature="t",
1113
def ApprovalDuration_dbus_property(self, value=None):
1114
if value is None: # get
1115
return dbus.UInt64(_timedelta_to_milliseconds(
1116
self.approval_duration))
1117
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1120
@dbus_service_property(_interface, signature="s", access="read")
1121
def Name_dbus_property(self):
949
1122
return dbus.String(self.name)
951
# fingerprint - property
952
@dbus_service_property(_interface, signature=u"s", access=u"read")
953
def fingerprint_dbus_property(self):
1124
# Fingerprint - property
1125
@dbus_service_property(_interface, signature="s", access="read")
1126
def Fingerprint_dbus_property(self):
954
1127
return dbus.String(self.fingerprint)
957
@dbus_service_property(_interface, signature=u"s",
959
def host_dbus_property(self, value=None):
1130
@dbus_service_property(_interface, signature="s",
1132
def Host_dbus_property(self, value=None):
960
1133
if value is None: # get
961
1134
return dbus.String(self.host)
962
1135
self.host = value
964
self.PropertyChanged(dbus.String(u"host"),
965
dbus.String(value, variant_level=1))
968
@dbus_service_property(_interface, signature=u"s", access=u"read")
969
def created_dbus_property(self):
970
return dbus.String(self._datetime_to_dbus(self.created))
972
# last_enabled - property
973
@dbus_service_property(_interface, signature=u"s", access=u"read")
974
def last_enabled_dbus_property(self):
975
if self.last_enabled is None:
976
return dbus.String(u"")
977
return dbus.String(self._datetime_to_dbus(self.last_enabled))
980
@dbus_service_property(_interface, signature=u"b",
982
def enabled_dbus_property(self, value=None):
1137
# Created - property
1138
@dbus_service_property(_interface, signature="s", access="read")
1139
def Created_dbus_property(self):
1140
return dbus.String(datetime_to_dbus(self.created))
1142
# LastEnabled - property
1143
@dbus_service_property(_interface, signature="s", access="read")
1144
def LastEnabled_dbus_property(self):
1145
return datetime_to_dbus(self.last_enabled)
1147
# Enabled - property
1148
@dbus_service_property(_interface, signature="b",
1150
def Enabled_dbus_property(self, value=None):
983
1151
if value is None: # get
984
1152
return dbus.Boolean(self.enabled)
990
# last_checked_ok - property
991
@dbus_service_property(_interface, signature=u"s",
993
def last_checked_ok_dbus_property(self, value=None):
1158
# LastCheckedOK - property
1159
@dbus_service_property(_interface, signature="s",
1161
def LastCheckedOK_dbus_property(self, value=None):
994
1162
if value is not None:
995
1163
self.checked_ok()
997
if self.last_checked_ok is None:
998
return dbus.String(u"")
999
return dbus.String(self._datetime_to_dbus(self
1002
# timeout - property
1003
@dbus_service_property(_interface, signature=u"t",
1004
access=u"readwrite")
1005
def timeout_dbus_property(self, value=None):
1165
return datetime_to_dbus(self.last_checked_ok)
1167
# Expires - property
1168
@dbus_service_property(_interface, signature="s", access="read")
1169
def Expires_dbus_property(self):
1170
return datetime_to_dbus(self.expires)
1172
# LastApprovalRequest - property
1173
@dbus_service_property(_interface, signature="s", access="read")
1174
def LastApprovalRequest_dbus_property(self):
1175
return datetime_to_dbus(self.last_approval_request)
1177
# Timeout - property
1178
@dbus_service_property(_interface, signature="t",
1180
def Timeout_dbus_property(self, value=None):
1006
1181
if value is None: # get
1007
1182
return dbus.UInt64(self.timeout_milliseconds())
1008
1183
self.timeout = datetime.timedelta(0, 0, 0, value)
1010
self.PropertyChanged(dbus.String(u"timeout"),
1011
dbus.UInt64(value, variant_level=1))
1012
if getattr(self, u"disable_initiator_tag", None) is None:
1184
if getattr(self, "disable_initiator_tag", None) is None:
1014
1186
# Reschedule timeout
1015
1187
gobject.source_remove(self.disable_initiator_tag)
1016
1188
self.disable_initiator_tag = None
1017
1190
time_to_die = (self.
1018
1191
_timedelta_to_milliseconds((self
1019
1192
.last_checked_ok
1024
1197
# The timeout has passed
1200
self.expires = (datetime.datetime.utcnow()
1201
+ datetime.timedelta(milliseconds =
1027
1203
self.disable_initiator_tag = (gobject.timeout_add
1028
1204
(time_to_die, self.disable))
1030
# interval - property
1031
@dbus_service_property(_interface, signature=u"t",
1032
access=u"readwrite")
1033
def interval_dbus_property(self, value=None):
1206
# ExtendedTimeout - property
1207
@dbus_service_property(_interface, signature="t",
1209
def ExtendedTimeout_dbus_property(self, value=None):
1210
if value is None: # get
1211
return dbus.UInt64(self.extended_timeout_milliseconds())
1212
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1214
# Interval - property
1215
@dbus_service_property(_interface, signature="t",
1217
def Interval_dbus_property(self, value=None):
1034
1218
if value is None: # get
1035
1219
return dbus.UInt64(self.interval_milliseconds())
1036
1220
self.interval = datetime.timedelta(0, 0, 0, value)
1038
self.PropertyChanged(dbus.String(u"interval"),
1039
dbus.UInt64(value, variant_level=1))
1040
if getattr(self, u"checker_initiator_tag", None) is None:
1221
if getattr(self, "checker_initiator_tag", None) is None:
1042
1223
# Reschedule checker run
1043
1224
gobject.source_remove(self.checker_initiator_tag)
1044
1225
self.checker_initiator_tag = (gobject.timeout_add
1045
1226
(value, self.start_checker))
1046
1227
self.start_checker() # Start one now, too
1048
# checker - property
1049
@dbus_service_property(_interface, signature=u"s",
1050
access=u"readwrite")
1051
def checker_dbus_property(self, value=None):
1229
# Checker - property
1230
@dbus_service_property(_interface, signature="s",
1232
def Checker_dbus_property(self, value=None):
1052
1233
if value is None: # get
1053
1234
return dbus.String(self.checker_command)
1054
1235
self.checker_command = value
1056
self.PropertyChanged(dbus.String(u"checker"),
1057
dbus.String(self.checker_command,
1060
# checker_running - property
1061
@dbus_service_property(_interface, signature=u"b",
1062
access=u"readwrite")
1063
def checker_running_dbus_property(self, value=None):
1237
# CheckerRunning - property
1238
@dbus_service_property(_interface, signature="b",
1240
def CheckerRunning_dbus_property(self, value=None):
1064
1241
if value is None: # get
1065
1242
return dbus.Boolean(self.checker is not None)
1117
1296
def handle(self):
1118
1297
with contextlib.closing(self.server.child_pipe) as child_pipe:
1119
logger.info(u"TCP connection from: %s",
1298
logger.info("TCP connection from: %s",
1120
1299
unicode(self.client_address))
1121
logger.debug(u"Pipe FD: %d",
1300
logger.debug("Pipe FD: %d",
1122
1301
self.server.child_pipe.fileno())
1124
1303
session = (gnutls.connection
1125
1304
.ClientSession(self.request,
1126
1305
gnutls.connection
1127
1306
.X509Credentials()))
1129
1308
# Note: gnutls.connection.X509Credentials is really a
1130
1309
# generic GnuTLS certificate credentials object so long as
1131
1310
# no X.509 keys are added to it. Therefore, we can use it
1132
1311
# here despite using OpenPGP certificates.
1134
#priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
1135
# u"+AES-256-CBC", u"+SHA1",
1136
# u"+COMP-NULL", u"+CTYPE-OPENPGP",
1313
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1314
# "+AES-256-CBC", "+SHA1",
1315
# "+COMP-NULL", "+CTYPE-OPENPGP",
1138
1317
# Use a fallback default, since this MUST be set.
1139
1318
priority = self.server.gnutls_priority
1140
1319
if priority is None:
1141
priority = u"NORMAL"
1142
1321
(gnutls.library.functions
1143
1322
.gnutls_priority_set_direct(session._c_object,
1144
1323
priority, None))
1146
1325
# Start communication using the Mandos protocol
1147
1326
# Get protocol number
1148
1327
line = self.request.makefile().readline()
1149
logger.debug(u"Protocol version: %r", line)
1328
logger.debug("Protocol version: %r", line)
1151
1330
if int(line.strip().split()[0]) > 1:
1152
1331
raise RuntimeError
1153
except (ValueError, IndexError, RuntimeError), error:
1154
logger.error(u"Unknown protocol version: %s", error)
1332
except (ValueError, IndexError, RuntimeError) as error:
1333
logger.error("Unknown protocol version: %s", error)
1157
1336
# Start GnuTLS connection
1159
1338
session.handshake()
1160
except gnutls.errors.GNUTLSError, error:
1161
logger.warning(u"Handshake failed: %s", error)
1339
except gnutls.errors.GNUTLSError as error:
1340
logger.warning("Handshake failed: %s", error)
1162
1341
# Do not run session.bye() here: the session is not
1163
1342
# established. Just abandon the request.
1165
logger.debug(u"Handshake succeeded")
1344
logger.debug("Handshake succeeded")
1167
1346
approval_required = False
1170
1349
fpr = self.fingerprint(self.peer_certificate
1172
except (TypeError, gnutls.errors.GNUTLSError), error:
1173
logger.warning(u"Bad certificate: %s", error)
1352
gnutls.errors.GNUTLSError) as error:
1353
logger.warning("Bad certificate: %s", error)
1175
logger.debug(u"Fingerprint: %s", fpr)
1355
logger.debug("Fingerprint: %s", fpr)
1178
1358
client = ProxyClient(child_pipe, fpr,
1179
1359
self.client_address)
1180
1360
except KeyError:
1183
if client.approved_delay:
1184
delay = client.approved_delay
1363
if client.approval_delay:
1364
delay = client.approval_delay
1185
1365
client.approvals_pending += 1
1186
1366
approval_required = True
1189
1369
if not client.enabled:
1190
logger.warning(u"Client %s is disabled",
1370
logger.info("Client %s is disabled",
1192
1372
if self.server.use_dbus:
1193
1373
# Emit D-Bus signal
1194
client.Rejected("Disabled")
1374
client.Rejected("Disabled")
1197
if client._approved or not client.approved_delay:
1377
if client._approved or not client.approval_delay:
1198
1378
#We are approved or approval is disabled
1200
1380
elif client._approved is None:
1201
logger.info(u"Client %s need approval",
1381
logger.info("Client %s needs approval",
1203
1383
if self.server.use_dbus:
1204
1384
# Emit D-Bus signal
1205
1385
client.NeedApproval(
1206
client.approved_delay_milliseconds(),
1386
client.approval_delay_milliseconds(),
1207
1387
client.approved_by_default)
1209
logger.warning(u"Client %s was not approved",
1389
logger.warning("Client %s was not approved",
1211
1391
if self.server.use_dbus:
1212
1392
# Emit D-Bus signal
1213
client.Rejected("Disapproved")
1393
client.Rejected("Denied")
1216
1396
#wait until timeout or approved
1217
#x = float(client._timedelta_to_milliseconds(delay))
1398
# ._timedelta_to_milliseconds(delay))
1218
1399
time = datetime.datetime.now()
1219
1400
client.changedstate.acquire()
1220
client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
1401
(client.changedstate.wait
1402
(float(client._timedelta_to_milliseconds(delay)
1221
1404
client.changedstate.release()
1222
1405
time2 = datetime.datetime.now()
1223
1406
if (time2 - time) >= delay:
1495
logger.warning(u"Client not found for fingerprint: %s, ad"
1496
u"dress: %s", fpr, address)
1677
logger.info("Client not found for fingerprint: %s, ad"
1678
"dress: %s", fpr, address)
1497
1679
if self.use_dbus:
1498
1680
# Emit D-Bus signal
1499
mandos_dbus_service.ClientNotFound(fpr, address)
1681
mandos_dbus_service.ClientNotFound(fpr,
1500
1683
parent_pipe.send(False)
1503
1686
gobject.io_add_watch(parent_pipe.fileno(),
1504
1687
gobject.IO_IN | gobject.IO_HUP,
1505
1688
functools.partial(self.handle_ipc,
1506
parent_pipe = parent_pipe,
1507
client_object = client))
1508
1693
parent_pipe.send(True)
1509
# remove the old hook in favor of the new above hook on same fileno
1694
# remove the old hook in favor of the new above hook on
1511
1697
if command == 'funcall':
1512
1698
funcname = request[1]
1513
1699
args = request[2]
1514
1700
kwargs = request[3]
1516
parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
1702
parent_pipe.send(('data', getattr(client_object,
1518
1706
if command == 'getattr':
1519
1707
attrname = request[1]
1520
1708
if callable(client_object.__getattribute__(attrname)):
1521
1709
parent_pipe.send(('function',))
1523
parent_pipe.send(('data', client_object.__getattribute__(attrname)))
1711
parent_pipe.send(('data', client_object
1712
.__getattribute__(attrname)))
1525
1714
if command == 'setattr':
1526
1715
attrname = request[1]
1527
1716
value = request[2]
1528
1717
setattr(client_object, attrname, value)
1533
1722
def string_to_delta(interval):
1534
1723
"""Parse a string and return a datetime.timedelta
1536
>>> string_to_delta(u'7d')
1725
>>> string_to_delta('7d')
1537
1726
datetime.timedelta(7)
1538
>>> string_to_delta(u'60s')
1727
>>> string_to_delta('60s')
1539
1728
datetime.timedelta(0, 60)
1540
>>> string_to_delta(u'60m')
1729
>>> string_to_delta('60m')
1541
1730
datetime.timedelta(0, 3600)
1542
>>> string_to_delta(u'24h')
1731
>>> string_to_delta('24h')
1543
1732
datetime.timedelta(1)
1544
>>> string_to_delta(u'1w')
1733
>>> string_to_delta('1w')
1545
1734
datetime.timedelta(7)
1546
>>> string_to_delta(u'5m 30s')
1735
>>> string_to_delta('5m 30s')
1547
1736
datetime.timedelta(0, 330)
1549
1738
timevalue = datetime.timedelta(0)
1623
1812
##################################################################
1624
1813
# Parsing of options, both command line and config file
1626
parser = optparse.OptionParser(version = "%%prog %s" % version)
1627
parser.add_option("-i", u"--interface", type=u"string",
1628
metavar="IF", help=u"Bind to interface IF")
1629
parser.add_option("-a", u"--address", type=u"string",
1630
help=u"Address to listen for requests on")
1631
parser.add_option("-p", u"--port", type=u"int",
1632
help=u"Port number to receive requests on")
1633
parser.add_option("--check", action=u"store_true",
1634
help=u"Run self-test")
1635
parser.add_option("--debug", action=u"store_true",
1636
help=u"Debug mode; run in foreground and log to"
1638
parser.add_option("--debuglevel", type=u"string", metavar="Level",
1639
help=u"Debug level for stdout output")
1640
parser.add_option("--priority", type=u"string", help=u"GnuTLS"
1641
u" priority string (see GnuTLS documentation)")
1642
parser.add_option("--servicename", type=u"string",
1643
metavar=u"NAME", help=u"Zeroconf service name")
1644
parser.add_option("--configdir", type=u"string",
1645
default=u"/etc/mandos", metavar=u"DIR",
1646
help=u"Directory to search for configuration"
1648
parser.add_option("--no-dbus", action=u"store_false",
1649
dest=u"use_dbus", help=u"Do not provide D-Bus"
1650
u" system bus interface")
1651
parser.add_option("--no-ipv6", action=u"store_false",
1652
dest=u"use_ipv6", help=u"Do not use IPv6")
1653
options = parser.parse_args()[0]
1815
parser = argparse.ArgumentParser()
1816
parser.add_argument("-v", "--version", action="version",
1817
version = "%%(prog)s %s" % version,
1818
help="show version number and exit")
1819
parser.add_argument("-i", "--interface", metavar="IF",
1820
help="Bind to interface IF")
1821
parser.add_argument("-a", "--address",
1822
help="Address to listen for requests on")
1823
parser.add_argument("-p", "--port", type=int,
1824
help="Port number to receive requests on")
1825
parser.add_argument("--check", action="store_true",
1826
help="Run self-test")
1827
parser.add_argument("--debug", action="store_true",
1828
help="Debug mode; run in foreground and log"
1830
parser.add_argument("--debuglevel", metavar="LEVEL",
1831
help="Debug level for stdout output")
1832
parser.add_argument("--priority", help="GnuTLS"
1833
" priority string (see GnuTLS documentation)")
1834
parser.add_argument("--servicename",
1835
metavar="NAME", help="Zeroconf service name")
1836
parser.add_argument("--configdir",
1837
default="/etc/mandos", metavar="DIR",
1838
help="Directory to search for configuration"
1840
parser.add_argument("--no-dbus", action="store_false",
1841
dest="use_dbus", help="Do not provide D-Bus"
1842
" system bus interface")
1843
parser.add_argument("--no-ipv6", action="store_false",
1844
dest="use_ipv6", help="Do not use IPv6")
1845
options = parser.parse_args()
1655
1847
if options.check:
1660
1852
# Default values for config file for server-global settings
1661
server_defaults = { u"interface": u"",
1666
u"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1667
u"servicename": u"Mandos",
1668
u"use_dbus": u"True",
1669
u"use_ipv6": u"True",
1853
server_defaults = { "interface": "",
1858
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1859
"servicename": "Mandos",
1673
1865
# Parse config file for server-global settings
1674
1866
server_config = configparser.SafeConfigParser(server_defaults)
1675
1867
del server_defaults
1676
1868
server_config.read(os.path.join(options.configdir,
1678
1870
# Convert the SafeConfigParser object to a dict
1679
1871
server_settings = server_config.defaults()
1680
1872
# Use the appropriate methods on the non-string config options
1681
for option in (u"debug", u"use_dbus", u"use_ipv6"):
1682
server_settings[option] = server_config.getboolean(u"DEFAULT",
1873
for option in ("debug", "use_dbus", "use_ipv6"):
1874
server_settings[option] = server_config.getboolean("DEFAULT",
1684
1876
if server_settings["port"]:
1685
server_settings["port"] = server_config.getint(u"DEFAULT",
1877
server_settings["port"] = server_config.getint("DEFAULT",
1687
1879
del server_config
1689
1881
# Override the settings from the config file with command line
1690
1882
# options, if set.
1691
for option in (u"interface", u"address", u"port", u"debug",
1692
u"priority", u"servicename", u"configdir",
1693
u"use_dbus", u"use_ipv6", u"debuglevel"):
1883
for option in ("interface", "address", "port", "debug",
1884
"priority", "servicename", "configdir",
1885
"use_dbus", "use_ipv6", "debuglevel"):
1694
1886
value = getattr(options, option)
1695
1887
if value is not None:
1696
1888
server_settings[option] = value
1704
1896
##################################################################
1706
1898
# For convenience
1707
debug = server_settings[u"debug"]
1708
debuglevel = server_settings[u"debuglevel"]
1709
use_dbus = server_settings[u"use_dbus"]
1710
use_ipv6 = server_settings[u"use_ipv6"]
1712
if server_settings[u"servicename"] != u"Mandos":
1899
debug = server_settings["debug"]
1900
debuglevel = server_settings["debuglevel"]
1901
use_dbus = server_settings["use_dbus"]
1902
use_ipv6 = server_settings["use_ipv6"]
1904
if server_settings["servicename"] != "Mandos":
1713
1905
syslogger.setFormatter(logging.Formatter
1714
(u'Mandos (%s) [%%(process)d]:'
1715
u' %%(levelname)s: %%(message)s'
1716
% server_settings[u"servicename"]))
1906
('Mandos (%s) [%%(process)d]:'
1907
' %%(levelname)s: %%(message)s'
1908
% server_settings["servicename"]))
1718
1910
# Parse config file with clients
1719
client_defaults = { u"timeout": u"1h",
1721
u"checker": u"fping -q -- %%(host)s",
1723
u"approved_delay": u"0s",
1724
u"approved_duration": u"1s",
1911
client_defaults = { "timeout": "5m",
1912
"extended_timeout": "15m",
1914
"checker": "fping -q -- %%(host)s",
1916
"approval_delay": "0s",
1917
"approval_duration": "1s",
1726
1919
client_config = configparser.SafeConfigParser(client_defaults)
1727
client_config.read(os.path.join(server_settings[u"configdir"],
1920
client_config.read(os.path.join(server_settings["configdir"],
1730
1923
global mandos_dbus_service
1731
1924
mandos_dbus_service = None
1733
tcp_server = MandosServer((server_settings[u"address"],
1734
server_settings[u"port"]),
1926
tcp_server = MandosServer((server_settings["address"],
1927
server_settings["port"]),
1736
interface=server_settings[u"interface"],
1929
interface=(server_settings["interface"]
1737
1931
use_ipv6=use_ipv6,
1738
1932
gnutls_priority=
1739
server_settings[u"priority"],
1933
server_settings["priority"],
1740
1934
use_dbus=use_dbus)
1741
pidfilename = u"/var/run/mandos.pid"
1743
pidfile = open(pidfilename, u"w")
1745
logger.error(u"Could not open file %r", pidfilename)
1936
pidfilename = "/var/run/mandos.pid"
1938
pidfile = open(pidfilename, "w")
1940
logger.error("Could not open file %r", pidfilename)
1748
uid = pwd.getpwnam(u"_mandos").pw_uid
1749
gid = pwd.getpwnam(u"_mandos").pw_gid
1943
uid = pwd.getpwnam("_mandos").pw_uid
1944
gid = pwd.getpwnam("_mandos").pw_gid
1750
1945
except KeyError:
1752
uid = pwd.getpwnam(u"mandos").pw_uid
1753
gid = pwd.getpwnam(u"mandos").pw_gid
1947
uid = pwd.getpwnam("mandos").pw_uid
1948
gid = pwd.getpwnam("mandos").pw_gid
1754
1949
except KeyError:
1756
uid = pwd.getpwnam(u"nobody").pw_uid
1757
gid = pwd.getpwnam(u"nobody").pw_gid
1951
uid = pwd.getpwnam("nobody").pw_uid
1952
gid = pwd.getpwnam("nobody").pw_gid
1758
1953
except KeyError:
1764
except OSError, error:
1959
except OSError as error:
1765
1960
if error[0] != errno.EPERM:
1768
# Enable all possible GnuTLS debugging
1771
1963
if not debug and not debuglevel:
1772
1964
syslogger.setLevel(logging.WARNING)
1773
1965
console.setLevel(logging.WARNING)
1806
2004
# End of Avahi example code
1809
bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos",
2007
bus_name = dbus.service.BusName("se.recompile.Mandos",
1810
2008
bus, do_not_queue=True)
1811
except dbus.exceptions.NameExistsException, e:
1812
logger.error(unicode(e) + u", disabling D-Bus")
2009
old_bus_name = (dbus.service.BusName
2010
("se.bsnet.fukt.Mandos", bus,
2012
except dbus.exceptions.NameExistsException as e:
2013
logger.error(unicode(e) + ", disabling D-Bus")
1813
2014
use_dbus = False
1814
server_settings[u"use_dbus"] = False
2015
server_settings["use_dbus"] = False
1815
2016
tcp_server.use_dbus = False
1816
2017
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1817
service = AvahiService(name = server_settings[u"servicename"],
1818
servicetype = u"_mandos._tcp",
2018
service = AvahiService(name = server_settings["servicename"],
2019
servicetype = "_mandos._tcp",
1819
2020
protocol = protocol, bus = bus)
1820
2021
if server_settings["interface"]:
1821
2022
service.interface = (if_nametoindex
1822
(str(server_settings[u"interface"])))
1825
# Close all input and output, do double fork, etc.
2023
(str(server_settings["interface"])))
1828
2025
global multiprocessing_manager
1829
2026
multiprocessing_manager = multiprocessing.Manager()
1831
2028
client_class = Client
1833
client_class = functools.partial(ClientDBus, bus = bus)
2030
client_class = functools.partial(ClientDBusTransitional,
1834
2032
def client_config_items(config, section):
1835
2033
special_settings = {
1836
2034
"approved_by_default":
1873
2072
class MandosDBusService(dbus.service.Object):
1874
2073
"""A D-Bus proxy object"""
1875
2074
def __init__(self):
1876
dbus.service.Object.__init__(self, bus, u"/")
1877
_interface = u"se.bsnet.fukt.Mandos"
2075
dbus.service.Object.__init__(self, bus, "/")
2076
_interface = "se.recompile.Mandos"
1879
@dbus.service.signal(_interface, signature=u"o")
2078
@dbus.service.signal(_interface, signature="o")
1880
2079
def ClientAdded(self, objpath):
1884
@dbus.service.signal(_interface, signature=u"ss")
2083
@dbus.service.signal(_interface, signature="ss")
1885
2084
def ClientNotFound(self, fingerprint, address):
1889
@dbus.service.signal(_interface, signature=u"os")
2088
@dbus.service.signal(_interface, signature="os")
1890
2089
def ClientRemoved(self, objpath, name):
1894
@dbus.service.method(_interface, out_signature=u"ao")
2093
@dbus.service.method(_interface, out_signature="ao")
1895
2094
def GetAllClients(self):
1897
2096
return dbus.Array(c.dbus_object_path
1898
2097
for c in tcp_server.clients)
1900
2099
@dbus.service.method(_interface,
1901
out_signature=u"a{oa{sv}}")
2100
out_signature="a{oa{sv}}")
1902
2101
def GetAllClientsWithProperties(self):
1904
2103
return dbus.Dictionary(
1905
((c.dbus_object_path, c.GetAll(u""))
2104
((c.dbus_object_path, c.GetAll(""))
1906
2105
for c in tcp_server.clients),
1907
signature=u"oa{sv}")
1909
@dbus.service.method(_interface, in_signature=u"o")
2108
@dbus.service.method(_interface, in_signature="o")
1910
2109
def RemoveClient(self, object_path):
1912
2111
for c in tcp_server.clients: