152
150
self.group = None # our entry group
153
151
self.server = None
155
self.entry_group_state_changed_match = None
156
153
def rename(self):
157
154
"""Derived from the Avahi example code"""
158
155
if self.rename_count >= self.max_renames:
159
logger.critical("No suitable Zeroconf service name found"
160
" after %i retries, exiting.",
156
logger.critical(u"No suitable Zeroconf service name found"
157
u" after %i retries, exiting.",
161
158
self.rename_count)
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 ...",
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 ...",
167
163
syslogger.setFormatter(logging.Formatter
168
('Mandos (%s) [%%(process)d]:'
169
' %%(levelname)s: %%(message)s'
164
(u'Mandos (%s) [%%(process)d]:'
165
u' %%(levelname)s: %%(message)s'
174
except dbus.exceptions.DBusException as error:
175
logger.critical("DBusException: %s", error)
178
169
self.rename_count += 1
179
170
def remove(self):
180
171
"""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
184
172
if self.group is not None:
185
173
self.group.Reset()
187
175
"""Derived from the Avahi example code"""
189
176
if self.group is None:
190
177
self.group = dbus.Interface(
191
178
self.bus.get_object(avahi.DBUS_NAME,
192
179
self.server.EntryGroupNew()),
193
180
avahi.DBUS_INTERFACE_ENTRY_GROUP)
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' ...",
181
self.group.connect_to_signal('StateChanged',
183
.entry_group_state_changed)
184
logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
198
185
self.name, self.type)
199
186
self.group.AddService(
207
194
self.group.Commit()
208
195
def entry_group_state_changed(self, state, error):
209
196
"""Derived from the Avahi example code"""
210
logger.debug("Avahi entry group state change: %i", state)
197
logger.debug(u"Avahi entry group state change: %i", state)
212
199
if state == avahi.ENTRY_GROUP_ESTABLISHED:
213
logger.debug("Zeroconf service established.")
200
logger.debug(u"Zeroconf service established.")
214
201
elif state == avahi.ENTRY_GROUP_COLLISION:
215
logger.info("Zeroconf service name collision.")
202
logger.warning(u"Zeroconf service name collision.")
217
204
elif state == avahi.ENTRY_GROUP_FAILURE:
218
logger.critical("Avahi: Error in group state changed %s",
205
logger.critical(u"Avahi: Error in group state changed %s",
220
raise AvahiGroupError("State changed: %s"
207
raise AvahiGroupError(u"State changed: %s"
221
208
% unicode(error))
222
209
def cleanup(self):
223
210
"""Derived from the Avahi example code"""
224
211
if self.group is not None:
227
except (dbus.exceptions.UnknownMethodException,
228
dbus.exceptions.DBusException) as e:
230
213
self.group = None
232
def server_state_changed(self, state, error=None):
214
def server_state_changed(self, state):
233
215
"""Derived from the Avahi example code"""
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)
216
logger.debug(u"Avahi server state change: %i", state)
217
if state == avahi.SERVER_COLLISION:
218
logger.error(u"Zeroconf server name collision")
249
220
elif state == avahi.SERVER_RUNNING:
253
logger.debug("Unknown state: %r", state)
255
logger.debug("Unknown state: %r: %r", state, error)
256
222
def activate(self):
257
223
"""Derived from the Avahi example code"""
258
224
if self.server is None:
259
225
self.server = dbus.Interface(
260
226
self.bus.get_object(avahi.DBUS_NAME,
261
avahi.DBUS_PATH_SERVER,
262
follow_name_owner_changes=True),
227
avahi.DBUS_PATH_SERVER),
263
228
avahi.DBUS_INTERFACE_SERVER)
264
self.server.connect_to_signal("StateChanged",
229
self.server.connect_to_signal(u"StateChanged",
265
230
self.server_state_changed)
266
231
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))
275
234
class Client(object):
276
235
"""A representation of a client host served by this server.
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
238
name: string; from the config file, used in log messages and
240
fingerprint: string (40 or 32 hexadecimal digits); used to
241
uniquely identify the client
242
secret: bytestring; sent verbatim (over TLS) to client
243
host: string; available for use by the checker command
244
created: datetime.datetime(); (UTC) object creation
245
last_enabled: datetime.datetime(); (UTC)
247
last_checked_ok: datetime.datetime(); (UTC) or None
248
timeout: datetime.timedelta(); How long from last_checked_ok
249
until this client is disabled
250
interval: datetime.timedelta(); How often to start a new checker
251
disable_hook: If set, called by disable() as disable_hook(self)
282
252
checker: subprocess.Popen(); a running checker process used
283
253
to see if the client lives.
284
254
'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
255
checker_initiator_tag: a gobject event source tag, or None
256
disable_initiator_tag: - '' -
257
checker_callback_tag: - '' -
258
checker_command: string; External command which is run to check if
259
client lives. %() expansions are done at
288
260
runtime with vars(self) as dict, so that for
289
261
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
262
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
296
fingerprint: string (40 or 32 hexadecimal digits); used to
297
uniquely identify the client
298
host: string; available for use by the checker command
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
302
last_enabled: datetime.datetime(); (UTC)
303
name: string; from the config file, used in log messages and
305
secret: bytestring; sent verbatim (over TLS) to client
306
timeout: datetime.timedelta(); How long from last_checked_ok
307
until this client is disabled
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
263
approved_delay: datetime.timedelta(); Time to wait for approval
264
_approved: bool(); 'None' if not yet approved/disapproved
265
approved_duration: datetime.timedelta(); Duration of one approval
314
runtime_expansions = ("approval_delay", "approval_duration",
315
"created", "enabled", "fingerprint",
316
"host", "interval", "last_checked_ok",
317
"last_enabled", "name", "timeout")
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))
319
275
def timeout_milliseconds(self):
320
276
"Return the 'timeout' attribute in milliseconds"
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)
277
return self._timedelta_to_milliseconds(self.timeout)
327
279
def interval_milliseconds(self):
328
280
"Return the 'interval' attribute in milliseconds"
329
return _timedelta_to_milliseconds(self.interval)
331
def approval_delay_milliseconds(self):
332
return _timedelta_to_milliseconds(self.approval_delay)
281
return self._timedelta_to_milliseconds(self.interval)
283
def approved_delay_milliseconds(self):
284
return self._timedelta_to_milliseconds(self.approved_delay)
334
286
def __init__(self, name = None, disable_hook=None, config=None):
335
287
"""Note: the 'checker' key in 'config' sets the
339
291
if config is None:
341
logger.debug("Creating client %r", self.name)
293
logger.debug(u"Creating client %r", self.name)
342
294
# Uppercase and remove spaces from fingerprint for later
343
295
# comparison purposes with return value from the fingerprint()
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:
297
self.fingerprint = (config[u"fingerprint"].upper()
299
logger.debug(u" Fingerprint: %s", self.fingerprint)
300
if u"secret" in config:
301
self.secret = config[u"secret"].decode(u"base64")
302
elif u"secfile" in config:
351
303
with open(os.path.expanduser(os.path.expandvars
352
(config["secfile"])),
304
(config[u"secfile"])),
353
305
"rb") as secfile:
354
306
self.secret = secfile.read()
356
raise TypeError("No secret or secfile for client %s"
308
raise TypeError(u"No secret or secfile for client %s"
358
self.host = config.get("host", "")
310
self.host = config.get(u"host", u"")
359
311
self.created = datetime.datetime.utcnow()
360
312
self.enabled = False
361
self.last_approval_request = None
362
313
self.last_enabled = None
363
314
self.last_checked_ok = None
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"])
315
self.timeout = string_to_delta(config[u"timeout"])
316
self.interval = string_to_delta(config[u"interval"])
368
317
self.disable_hook = disable_hook
369
318
self.checker = None
370
319
self.checker_initiator_tag = None
371
320
self.disable_initiator_tag = None
373
321
self.checker_callback_tag = None
374
self.checker_command = config["checker"]
322
self.checker_command = config[u"checker"]
375
323
self.current_checker_command = None
376
324
self.last_connect = None
377
325
self._approved = None
378
self.approved_by_default = config.get("approved_by_default",
326
self.approved_by_default = config.get(u"approved_by_default",
380
328
self.approvals_pending = 0
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
329
self.approved_delay = string_to_delta(
330
config[u"approved_delay"])
331
self.approved_duration = string_to_delta(
332
config[u"approved_duration"])
333
self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
389
335
def send_changedstate(self):
390
336
self.changedstate.acquire()
391
337
self.changedstate.notify_all()
392
338
self.changedstate.release()
394
340
def enable(self):
395
341
"""Start this client's checker and timeout hooks"""
396
if getattr(self, "enabled", False):
342
if getattr(self, u"enabled", False):
397
343
# Already enabled
399
345
self.send_changedstate()
346
self.last_enabled = datetime.datetime.utcnow()
400
347
# Schedule a new checker to be started an 'interval' from now,
401
348
# and every interval from then on.
402
349
self.checker_initiator_tag = (gobject.timeout_add
403
350
(self.interval_milliseconds(),
404
351
self.start_checker))
405
352
# Schedule a disable() when 'timeout' has passed
406
self.expires = datetime.datetime.utcnow() + self.timeout
407
353
self.disable_initiator_tag = (gobject.timeout_add
408
354
(self.timeout_milliseconds(),
410
356
self.enabled = True
411
self.last_enabled = datetime.datetime.utcnow()
412
357
# Also start a new checker *right now*.
413
358
self.start_checker()
628
563
def _is_dbus_property(obj):
629
return getattr(obj, "_dbus_is_property", False)
564
return getattr(obj, u"_dbus_is_property", False)
631
566
def _get_all_dbus_properties(self):
632
567
"""Returns a generator of (name, attribute) pairs
634
return ((prop.__get__(self)._dbus_name, prop.__get__(self))
635
for cls in self.__class__.__mro__
569
return ((prop._dbus_name, prop)
636
570
for name, prop in
637
inspect.getmembers(cls, self._is_dbus_property))
571
inspect.getmembers(self, self._is_dbus_property))
639
573
def _get_dbus_property(self, interface_name, property_name):
640
574
"""Returns a bound method if one exists which is a D-Bus
641
575
property with the specified name and 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)
577
for name in (property_name,
578
property_name + u"_dbus_property"):
579
prop = getattr(self, name, None)
581
or not self._is_dbus_property(prop)
582
or prop._dbus_name != property_name
583
or (interface_name and prop._dbus_interface
584
and interface_name != prop._dbus_interface)):
650
587
# No such property
651
raise DBusPropertyNotFound(self.dbus_object_path + ":"
652
+ interface_name + "."
588
raise DBusPropertyNotFound(self.dbus_object_path + u":"
589
+ interface_name + u"."
655
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
592
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ss",
657
594
def Get(self, interface_name, property_name):
658
595
"""Standard D-Bus property Get() method, see D-Bus standard.
660
597
prop = self._get_dbus_property(interface_name, property_name)
661
if prop._dbus_access == "write":
598
if prop._dbus_access == u"write":
662
599
raise DBusPropertyAccessException(property_name)
664
if not hasattr(value, "variant_level"):
601
if not hasattr(value, u"variant_level"):
666
603
return type(value)(value, variant_level=value.variant_level+1)
668
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
605
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ssv")
669
606
def Set(self, interface_name, property_name, value):
670
607
"""Standard D-Bus property Set() method, see D-Bus standard.
672
609
prop = self._get_dbus_property(interface_name, property_name)
673
if prop._dbus_access == "read":
610
if prop._dbus_access == u"read":
674
611
raise DBusPropertyAccessException(property_name)
675
if prop._dbus_get_args_options["byte_arrays"]:
612
if prop._dbus_get_args_options[u"byte_arrays"]:
676
613
# The byte_arrays option is not supported yet on
677
614
# signatures other than "ay".
678
if prop._dbus_signature != "ay":
615
if prop._dbus_signature != u"ay":
680
617
value = dbus.ByteArray(''.join(unichr(byte)
681
618
for byte in value))
684
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
685
out_signature="a{sv}")
621
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"s",
622
out_signature=u"a{sv}")
686
623
def GetAll(self, interface_name):
687
624
"""Standard D-Bus property GetAll() method, see D-Bus
690
627
Note: Will not include properties with access="write".
719
656
document = xml.dom.minidom.parseString(xmlstring)
720
657
def make_tag(document, name, prop):
721
e = document.createElement("property")
722
e.setAttribute("name", name)
723
e.setAttribute("type", prop._dbus_signature)
724
e.setAttribute("access", prop._dbus_access)
658
e = document.createElement(u"property")
659
e.setAttribute(u"name", name)
660
e.setAttribute(u"type", prop._dbus_signature)
661
e.setAttribute(u"access", prop._dbus_access)
726
for if_tag in document.getElementsByTagName("interface"):
663
for if_tag in document.getElementsByTagName(u"interface"):
727
664
for tag in (make_tag(document, name, prop)
729
666
in self._get_all_dbus_properties()
730
667
if prop._dbus_interface
731
== if_tag.getAttribute("name")):
668
== if_tag.getAttribute(u"name")):
732
669
if_tag.appendChild(tag)
733
670
# Add the names to the return values for the
734
671
# "org.freedesktop.DBus.Properties" methods
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")
672
if (if_tag.getAttribute(u"name")
673
== u"org.freedesktop.DBus.Properties"):
674
for cn in if_tag.getElementsByTagName(u"method"):
675
if cn.getAttribute(u"name") == u"Get":
676
for arg in cn.getElementsByTagName(u"arg"):
677
if (arg.getAttribute(u"direction")
679
arg.setAttribute(u"name", u"value")
680
elif cn.getAttribute(u"name") == u"GetAll":
681
for arg in cn.getElementsByTagName(u"arg"):
682
if (arg.getAttribute(u"direction")
684
arg.setAttribute(u"name", u"props")
685
xmlstring = document.toxml(u"utf-8")
749
686
document.unlink()
750
687
except (AttributeError, xml.dom.DOMException,
751
xml.parsers.expat.ExpatError) as error:
752
logger.error("Failed to override Introspection method",
688
xml.parsers.expat.ExpatError), error:
689
logger.error(u"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)
861
694
class ClientDBus(Client, DBusObjectWithProperties):
862
695
"""A Client class using D-Bus
877
706
Client.__init__(self, *args, **kwargs)
878
707
# Only now, when this client is initialized, can it show up on
880
client_object_name = unicode(self.name).translate(
883
709
self.dbus_object_path = (dbus.ObjectPath
884
("/clients/" + client_object_name))
711
+ self.name.replace(u".", u"_")))
885
712
DBusObjectWithProperties.__init__(self, self.bus,
886
713
self.dbus_object_path)
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
715
def _get_approvals_pending(self):
716
return self._approvals_pending
717
def _set_approvals_pending(self, value):
718
old_value = self._approvals_pending
719
self._approvals_pending = value
721
if (hasattr(self, "dbus_object_path")
722
and bval is not bool(old_value)):
723
dbus_bool = dbus.Boolean(bval, variant_level=1)
724
self.PropertyChanged(dbus.String(u"approved_pending"),
727
approvals_pending = property(_get_approvals_pending,
728
_set_approvals_pending)
729
del _get_approvals_pending, _set_approvals_pending
732
def _datetime_to_dbus(dt, variant_level=0):
733
"""Convert a UTC datetime.datetime() to a D-Bus type."""
734
return dbus.String(dt.isoformat(),
735
variant_level=variant_level)
738
oldstate = getattr(self, u"enabled", False)
739
r = Client.enable(self)
740
if oldstate != self.enabled:
742
self.PropertyChanged(dbus.String(u"enabled"),
743
dbus.Boolean(True, variant_level=1))
744
self.PropertyChanged(
745
dbus.String(u"last_enabled"),
746
self._datetime_to_dbus(self.last_enabled,
750
def disable(self, quiet = False):
751
oldstate = getattr(self, u"enabled", False)
752
r = Client.disable(self, quiet=quiet)
753
if not quiet and oldstate != self.enabled:
755
self.PropertyChanged(dbus.String(u"enabled"),
756
dbus.Boolean(False, variant_level=1))
954
759
def __del__(self, *args, **kwargs):
956
761
self.remove_from_connection()
957
762
except LookupError:
959
if hasattr(DBusObjectWithProperties, "__del__"):
764
if hasattr(DBusObjectWithProperties, u"__del__"):
960
765
DBusObjectWithProperties.__del__(self, *args, **kwargs)
961
766
Client.__del__(self, *args, **kwargs)
1089
# ApprovalPending - property
1090
@dbus_service_property(_interface, signature="b", access="read")
1091
def ApprovalPending_dbus_property(self):
917
# approved_pending - property
918
@dbus_service_property(_interface, signature=u"b", access=u"read")
919
def approved_pending_dbus_property(self):
1092
920
return dbus.Boolean(bool(self.approvals_pending))
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):
922
# approved_by_default - property
923
@dbus_service_property(_interface, signature=u"b",
925
def approved_by_default_dbus_property(self):
926
return dbus.Boolean(self.approved_by_default)
928
# approved_delay - property
929
@dbus_service_property(_interface, signature=u"t",
931
def approved_delay_dbus_property(self):
932
return dbus.UInt64(self.approved_delay_milliseconds())
934
# approved_duration - property
935
@dbus_service_property(_interface, signature=u"t",
937
def approved_duration_dbus_property(self):
938
return dbus.UInt64(self._timedelta_to_milliseconds(
939
self.approved_duration))
942
@dbus_service_property(_interface, signature=u"s", access=u"read")
943
def name_dbus_property(self):
1122
944
return dbus.String(self.name)
1124
# Fingerprint - property
1125
@dbus_service_property(_interface, signature="s", access="read")
1126
def Fingerprint_dbus_property(self):
946
# fingerprint - property
947
@dbus_service_property(_interface, signature=u"s", access=u"read")
948
def fingerprint_dbus_property(self):
1127
949
return dbus.String(self.fingerprint)
1130
@dbus_service_property(_interface, signature="s",
1132
def Host_dbus_property(self, value=None):
952
@dbus_service_property(_interface, signature=u"s",
954
def host_dbus_property(self, value=None):
1133
955
if value is None: # get
1134
956
return dbus.String(self.host)
1135
957
self.host = value
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):
959
self.PropertyChanged(dbus.String(u"host"),
960
dbus.String(value, variant_level=1))
963
@dbus_service_property(_interface, signature=u"s", access=u"read")
964
def created_dbus_property(self):
965
return dbus.String(self._datetime_to_dbus(self.created))
967
# last_enabled - property
968
@dbus_service_property(_interface, signature=u"s", access=u"read")
969
def last_enabled_dbus_property(self):
970
if self.last_enabled is None:
971
return dbus.String(u"")
972
return dbus.String(self._datetime_to_dbus(self.last_enabled))
975
@dbus_service_property(_interface, signature=u"b",
977
def enabled_dbus_property(self, value=None):
1151
978
if value is None: # get
1152
979
return dbus.Boolean(self.enabled)
1158
# LastCheckedOK - property
1159
@dbus_service_property(_interface, signature="s",
1161
def LastCheckedOK_dbus_property(self, value=None):
985
# last_checked_ok - property
986
@dbus_service_property(_interface, signature=u"s",
988
def last_checked_ok_dbus_property(self, value=None):
1162
989
if value is not None:
1163
990
self.checked_ok()
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):
992
if self.last_checked_ok is None:
993
return dbus.String(u"")
994
return dbus.String(self._datetime_to_dbus(self
998
@dbus_service_property(_interface, signature=u"t",
1000
def timeout_dbus_property(self, value=None):
1181
1001
if value is None: # get
1182
1002
return dbus.UInt64(self.timeout_milliseconds())
1183
1003
self.timeout = datetime.timedelta(0, 0, 0, value)
1184
if getattr(self, "disable_initiator_tag", None) is None:
1005
self.PropertyChanged(dbus.String(u"timeout"),
1006
dbus.UInt64(value, variant_level=1))
1007
if getattr(self, u"disable_initiator_tag", None) is None:
1186
1009
# Reschedule timeout
1187
1010
gobject.source_remove(self.disable_initiator_tag)
1188
1011
self.disable_initiator_tag = None
1190
1012
time_to_die = (self.
1191
1013
_timedelta_to_milliseconds((self
1192
1014
.last_checked_ok
1197
1019
# The timeout has passed
1200
self.expires = (datetime.datetime.utcnow()
1201
+ datetime.timedelta(milliseconds =
1203
1022
self.disable_initiator_tag = (gobject.timeout_add
1204
1023
(time_to_die, self.disable))
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):
1025
# interval - property
1026
@dbus_service_property(_interface, signature=u"t",
1027
access=u"readwrite")
1028
def interval_dbus_property(self, value=None):
1218
1029
if value is None: # get
1219
1030
return dbus.UInt64(self.interval_milliseconds())
1220
1031
self.interval = datetime.timedelta(0, 0, 0, value)
1221
if getattr(self, "checker_initiator_tag", None) is None:
1033
self.PropertyChanged(dbus.String(u"interval"),
1034
dbus.UInt64(value, variant_level=1))
1035
if getattr(self, u"checker_initiator_tag", None) is None:
1223
1037
# Reschedule checker run
1224
1038
gobject.source_remove(self.checker_initiator_tag)
1225
1039
self.checker_initiator_tag = (gobject.timeout_add
1226
1040
(value, self.start_checker))
1227
1041
self.start_checker() # Start one now, too
1229
# Checker - property
1230
@dbus_service_property(_interface, signature="s",
1232
def Checker_dbus_property(self, value=None):
1043
# checker - property
1044
@dbus_service_property(_interface, signature=u"s",
1045
access=u"readwrite")
1046
def checker_dbus_property(self, value=None):
1233
1047
if value is None: # get
1234
1048
return dbus.String(self.checker_command)
1235
1049
self.checker_command = value
1051
self.PropertyChanged(dbus.String(u"checker"),
1052
dbus.String(self.checker_command,
1237
# CheckerRunning - property
1238
@dbus_service_property(_interface, signature="b",
1240
def CheckerRunning_dbus_property(self, value=None):
1055
# checker_running - property
1056
@dbus_service_property(_interface, signature=u"b",
1057
access=u"readwrite")
1058
def checker_running_dbus_property(self, value=None):
1241
1059
if value is None: # get
1242
1060
return dbus.Boolean(self.checker is not None)
1296
1112
def handle(self):
1297
1113
with contextlib.closing(self.server.child_pipe) as child_pipe:
1298
logger.info("TCP connection from: %s",
1114
logger.info(u"TCP connection from: %s",
1299
1115
unicode(self.client_address))
1300
logger.debug("Pipe FD: %d",
1116
logger.debug(u"Pipe FD: %d",
1301
1117
self.server.child_pipe.fileno())
1303
1119
session = (gnutls.connection
1304
1120
.ClientSession(self.request,
1305
1121
gnutls.connection
1306
1122
.X509Credentials()))
1308
1124
# Note: gnutls.connection.X509Credentials is really a
1309
1125
# generic GnuTLS certificate credentials object so long as
1310
1126
# no X.509 keys are added to it. Therefore, we can use it
1311
1127
# here despite using OpenPGP certificates.
1313
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1314
# "+AES-256-CBC", "+SHA1",
1315
# "+COMP-NULL", "+CTYPE-OPENPGP",
1129
#priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
1130
# u"+AES-256-CBC", u"+SHA1",
1131
# u"+COMP-NULL", u"+CTYPE-OPENPGP",
1317
1133
# Use a fallback default, since this MUST be set.
1318
1134
priority = self.server.gnutls_priority
1319
1135
if priority is None:
1136
priority = u"NORMAL"
1321
1137
(gnutls.library.functions
1322
1138
.gnutls_priority_set_direct(session._c_object,
1323
1139
priority, None))
1325
1141
# Start communication using the Mandos protocol
1326
1142
# Get protocol number
1327
1143
line = self.request.makefile().readline()
1328
logger.debug("Protocol version: %r", line)
1144
logger.debug(u"Protocol version: %r", line)
1330
1146
if int(line.strip().split()[0]) > 1:
1331
1147
raise RuntimeError
1332
except (ValueError, IndexError, RuntimeError) as error:
1333
logger.error("Unknown protocol version: %s", error)
1148
except (ValueError, IndexError, RuntimeError), error:
1149
logger.error(u"Unknown protocol version: %s", error)
1336
1152
# Start GnuTLS connection
1338
1154
session.handshake()
1339
except gnutls.errors.GNUTLSError as error:
1340
logger.warning("Handshake failed: %s", error)
1155
except gnutls.errors.GNUTLSError, error:
1156
logger.warning(u"Handshake failed: %s", error)
1341
1157
# Do not run session.bye() here: the session is not
1342
1158
# established. Just abandon the request.
1344
logger.debug("Handshake succeeded")
1160
logger.debug(u"Handshake succeeded")
1346
1162
approval_required = False
1349
1165
fpr = self.fingerprint(self.peer_certificate
1352
gnutls.errors.GNUTLSError) as error:
1353
logger.warning("Bad certificate: %s", error)
1167
except (TypeError, gnutls.errors.GNUTLSError), error:
1168
logger.warning(u"Bad certificate: %s", error)
1355
logger.debug("Fingerprint: %s", fpr)
1170
logger.debug(u"Fingerprint: %s", fpr)
1358
1173
client = ProxyClient(child_pipe, fpr,
1359
1174
self.client_address)
1360
1175
except KeyError:
1363
if client.approval_delay:
1364
delay = client.approval_delay
1178
if client.approved_delay:
1179
delay = client.approved_delay
1365
1180
client.approvals_pending += 1
1366
1181
approval_required = True
1369
1184
if not client.enabled:
1370
logger.info("Client %s is disabled",
1185
logger.warning(u"Client %s is disabled",
1372
1187
if self.server.use_dbus:
1373
1188
# Emit D-Bus signal
1374
client.Rejected("Disabled")
1189
client.Rejected("Disabled")
1377
if client._approved or not client.approval_delay:
1192
if client._approved or not client.approved_delay:
1378
1193
#We are approved or approval is disabled
1380
1195
elif client._approved is None:
1381
logger.info("Client %s needs approval",
1196
logger.info(u"Client %s need approval",
1383
1198
if self.server.use_dbus:
1384
1199
# Emit D-Bus signal
1385
1200
client.NeedApproval(
1386
client.approval_delay_milliseconds(),
1201
client.approved_delay_milliseconds(),
1387
1202
client.approved_by_default)
1389
logger.warning("Client %s was not approved",
1204
logger.warning(u"Client %s was not approved",
1391
1206
if self.server.use_dbus:
1392
1207
# Emit D-Bus signal
1393
client.Rejected("Denied")
1208
client.Rejected("Disapproved")
1396
1211
#wait until timeout or approved
1398
# ._timedelta_to_milliseconds(delay))
1212
#x = float(client._timedelta_to_milliseconds(delay))
1399
1213
time = datetime.datetime.now()
1400
1214
client.changedstate.acquire()
1401
(client.changedstate.wait
1402
(float(client._timedelta_to_milliseconds(delay)
1215
client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
1404
1216
client.changedstate.release()
1405
1217
time2 = datetime.datetime.now()
1406
1218
if (time2 - time) >= delay:
1677
logger.info("Client not found for fingerprint: %s, ad"
1678
"dress: %s", fpr, address)
1490
logger.warning(u"Client not found for fingerprint: %s, ad"
1491
u"dress: %s", fpr, address)
1679
1492
if self.use_dbus:
1680
1493
# Emit D-Bus signal
1681
mandos_dbus_service.ClientNotFound(fpr,
1494
mandos_dbus_service.ClientNotFound(fpr, address)
1683
1495
parent_pipe.send(False)
1686
1498
gobject.io_add_watch(parent_pipe.fileno(),
1687
1499
gobject.IO_IN | gobject.IO_HUP,
1688
1500
functools.partial(self.handle_ipc,
1501
parent_pipe = parent_pipe,
1502
client_object = client))
1693
1503
parent_pipe.send(True)
1694
# remove the old hook in favor of the new above hook on
1504
# remove the old hook in favor of the new above hook on same fileno
1697
1506
if command == 'funcall':
1698
1507
funcname = request[1]
1699
1508
args = request[2]
1700
1509
kwargs = request[3]
1702
parent_pipe.send(('data', getattr(client_object,
1511
parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
1706
1513
if command == 'getattr':
1707
1514
attrname = request[1]
1708
1515
if callable(client_object.__getattribute__(attrname)):
1709
1516
parent_pipe.send(('function',))
1711
parent_pipe.send(('data', client_object
1712
.__getattribute__(attrname)))
1518
parent_pipe.send(('data', client_object.__getattribute__(attrname)))
1714
1520
if command == 'setattr':
1715
1521
attrname = request[1]
1716
1522
value = request[2]
1717
1523
setattr(client_object, attrname, value)
1722
1528
def string_to_delta(interval):
1723
1529
"""Parse a string and return a datetime.timedelta
1725
>>> string_to_delta('7d')
1531
>>> string_to_delta(u'7d')
1726
1532
datetime.timedelta(7)
1727
>>> string_to_delta('60s')
1533
>>> string_to_delta(u'60s')
1728
1534
datetime.timedelta(0, 60)
1729
>>> string_to_delta('60m')
1535
>>> string_to_delta(u'60m')
1730
1536
datetime.timedelta(0, 3600)
1731
>>> string_to_delta('24h')
1537
>>> string_to_delta(u'24h')
1732
1538
datetime.timedelta(1)
1733
>>> string_to_delta('1w')
1539
>>> string_to_delta(u'1w')
1734
1540
datetime.timedelta(7)
1735
>>> string_to_delta('5m 30s')
1541
>>> string_to_delta(u'5m 30s')
1736
1542
datetime.timedelta(0, 330)
1738
1544
timevalue = datetime.timedelta(0)
1812
1618
##################################################################
1813
1619
# Parsing of options, both command line and config file
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()
1621
parser = optparse.OptionParser(version = "%%prog %s" % version)
1622
parser.add_option("-i", u"--interface", type=u"string",
1623
metavar="IF", help=u"Bind to interface IF")
1624
parser.add_option("-a", u"--address", type=u"string",
1625
help=u"Address to listen for requests on")
1626
parser.add_option("-p", u"--port", type=u"int",
1627
help=u"Port number to receive requests on")
1628
parser.add_option("--check", action=u"store_true",
1629
help=u"Run self-test")
1630
parser.add_option("--debug", action=u"store_true",
1631
help=u"Debug mode; run in foreground and log to"
1633
parser.add_option("--debuglevel", type=u"string", metavar="Level",
1634
help=u"Debug level for stdout output")
1635
parser.add_option("--priority", type=u"string", help=u"GnuTLS"
1636
u" priority string (see GnuTLS documentation)")
1637
parser.add_option("--servicename", type=u"string",
1638
metavar=u"NAME", help=u"Zeroconf service name")
1639
parser.add_option("--configdir", type=u"string",
1640
default=u"/etc/mandos", metavar=u"DIR",
1641
help=u"Directory to search for configuration"
1643
parser.add_option("--no-dbus", action=u"store_false",
1644
dest=u"use_dbus", help=u"Do not provide D-Bus"
1645
u" system bus interface")
1646
parser.add_option("--no-ipv6", action=u"store_false",
1647
dest=u"use_ipv6", help=u"Do not use IPv6")
1648
options = parser.parse_args()[0]
1847
1650
if options.check:
1852
1655
# Default values for config file for server-global settings
1853
server_defaults = { "interface": "",
1858
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1859
"servicename": "Mandos",
1656
server_defaults = { u"interface": u"",
1661
u"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1662
u"servicename": u"Mandos",
1663
u"use_dbus": u"True",
1664
u"use_ipv6": u"True",
1865
1668
# Parse config file for server-global settings
1866
1669
server_config = configparser.SafeConfigParser(server_defaults)
1867
1670
del server_defaults
1868
1671
server_config.read(os.path.join(options.configdir,
1870
1673
# Convert the SafeConfigParser object to a dict
1871
1674
server_settings = server_config.defaults()
1872
1675
# Use the appropriate methods on the non-string config options
1873
for option in ("debug", "use_dbus", "use_ipv6"):
1874
server_settings[option] = server_config.getboolean("DEFAULT",
1676
for option in (u"debug", u"use_dbus", u"use_ipv6"):
1677
server_settings[option] = server_config.getboolean(u"DEFAULT",
1876
1679
if server_settings["port"]:
1877
server_settings["port"] = server_config.getint("DEFAULT",
1680
server_settings["port"] = server_config.getint(u"DEFAULT",
1879
1682
del server_config
1881
1684
# Override the settings from the config file with command line
1882
1685
# options, if set.
1883
for option in ("interface", "address", "port", "debug",
1884
"priority", "servicename", "configdir",
1885
"use_dbus", "use_ipv6", "debuglevel"):
1686
for option in (u"interface", u"address", u"port", u"debug",
1687
u"priority", u"servicename", u"configdir",
1688
u"use_dbus", u"use_ipv6", u"debuglevel"):
1886
1689
value = getattr(options, option)
1887
1690
if value is not None:
1888
1691
server_settings[option] = value
1896
1699
##################################################################
1898
1701
# For convenience
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":
1702
debug = server_settings[u"debug"]
1703
debuglevel = server_settings[u"debuglevel"]
1704
use_dbus = server_settings[u"use_dbus"]
1705
use_ipv6 = server_settings[u"use_ipv6"]
1707
if server_settings[u"servicename"] != u"Mandos":
1905
1708
syslogger.setFormatter(logging.Formatter
1906
('Mandos (%s) [%%(process)d]:'
1907
' %%(levelname)s: %%(message)s'
1908
% server_settings["servicename"]))
1709
(u'Mandos (%s) [%%(process)d]:'
1710
u' %%(levelname)s: %%(message)s'
1711
% server_settings[u"servicename"]))
1910
1713
# Parse config file with clients
1911
client_defaults = { "timeout": "5m",
1912
"extended_timeout": "15m",
1914
"checker": "fping -q -- %%(host)s",
1916
"approval_delay": "0s",
1917
"approval_duration": "1s",
1714
client_defaults = { u"timeout": u"1h",
1716
u"checker": u"fping -q -- %%(host)s",
1718
u"approved_delay": u"0s",
1719
u"approved_duration": u"1s",
1919
1721
client_config = configparser.SafeConfigParser(client_defaults)
1920
client_config.read(os.path.join(server_settings["configdir"],
1722
client_config.read(os.path.join(server_settings[u"configdir"],
1923
1725
global mandos_dbus_service
1924
1726
mandos_dbus_service = None
1926
tcp_server = MandosServer((server_settings["address"],
1927
server_settings["port"]),
1728
tcp_server = MandosServer((server_settings[u"address"],
1729
server_settings[u"port"]),
1929
interface=(server_settings["interface"]
1731
interface=server_settings[u"interface"],
1931
1732
use_ipv6=use_ipv6,
1932
1733
gnutls_priority=
1933
server_settings["priority"],
1734
server_settings[u"priority"],
1934
1735
use_dbus=use_dbus)
1936
pidfilename = "/var/run/mandos.pid"
1938
pidfile = open(pidfilename, "w")
1940
logger.error("Could not open file %r", pidfilename)
1736
pidfilename = u"/var/run/mandos.pid"
1738
pidfile = open(pidfilename, u"w")
1740
logger.error(u"Could not open file %r", pidfilename)
1943
uid = pwd.getpwnam("_mandos").pw_uid
1944
gid = pwd.getpwnam("_mandos").pw_gid
1743
uid = pwd.getpwnam(u"_mandos").pw_uid
1744
gid = pwd.getpwnam(u"_mandos").pw_gid
1945
1745
except KeyError:
1947
uid = pwd.getpwnam("mandos").pw_uid
1948
gid = pwd.getpwnam("mandos").pw_gid
1747
uid = pwd.getpwnam(u"mandos").pw_uid
1748
gid = pwd.getpwnam(u"mandos").pw_gid
1949
1749
except KeyError:
1951
uid = pwd.getpwnam("nobody").pw_uid
1952
gid = pwd.getpwnam("nobody").pw_gid
1751
uid = pwd.getpwnam(u"nobody").pw_uid
1752
gid = pwd.getpwnam(u"nobody").pw_gid
1953
1753
except KeyError:
1959
except OSError as error:
1759
except OSError, error:
1960
1760
if error[0] != errno.EPERM:
1763
# Enable all possible GnuTLS debugging
1963
1766
if not debug and not debuglevel:
1964
1767
syslogger.setLevel(logging.WARNING)
1965
1768
console.setLevel(logging.WARNING)
2004
1801
# End of Avahi example code
2007
bus_name = dbus.service.BusName("se.recompile.Mandos",
1804
bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos",
2008
1805
bus, do_not_queue=True)
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")
1806
except dbus.exceptions.NameExistsException, e:
1807
logger.error(unicode(e) + u", disabling D-Bus")
2014
1808
use_dbus = False
2015
server_settings["use_dbus"] = False
1809
server_settings[u"use_dbus"] = False
2016
1810
tcp_server.use_dbus = False
2017
1811
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2018
service = AvahiService(name = server_settings["servicename"],
2019
servicetype = "_mandos._tcp",
1812
service = AvahiService(name = server_settings[u"servicename"],
1813
servicetype = u"_mandos._tcp",
2020
1814
protocol = protocol, bus = bus)
2021
1815
if server_settings["interface"]:
2022
1816
service.interface = (if_nametoindex
2023
(str(server_settings["interface"])))
1817
(str(server_settings[u"interface"])))
1820
# Close all input and output, do double fork, etc.
2025
1823
global multiprocessing_manager
2026
1824
multiprocessing_manager = multiprocessing.Manager()
2028
1826
client_class = Client
2030
client_class = functools.partial(ClientDBusTransitional,
1828
client_class = functools.partial(ClientDBus, bus = bus)
2032
1829
def client_config_items(config, section):
2033
1830
special_settings = {
2034
1831
"approved_by_default":
2072
1868
class MandosDBusService(dbus.service.Object):
2073
1869
"""A D-Bus proxy object"""
2074
1870
def __init__(self):
2075
dbus.service.Object.__init__(self, bus, "/")
2076
_interface = "se.recompile.Mandos"
1871
dbus.service.Object.__init__(self, bus, u"/")
1872
_interface = u"se.bsnet.fukt.Mandos"
2078
@dbus.service.signal(_interface, signature="o")
1874
@dbus.service.signal(_interface, signature=u"o")
2079
1875
def ClientAdded(self, objpath):
2083
@dbus.service.signal(_interface, signature="ss")
1879
@dbus.service.signal(_interface, signature=u"ss")
2084
1880
def ClientNotFound(self, fingerprint, address):
2088
@dbus.service.signal(_interface, signature="os")
1884
@dbus.service.signal(_interface, signature=u"os")
2089
1885
def ClientRemoved(self, objpath, name):
2093
@dbus.service.method(_interface, out_signature="ao")
1889
@dbus.service.method(_interface, out_signature=u"ao")
2094
1890
def GetAllClients(self):
2096
1892
return dbus.Array(c.dbus_object_path
2097
1893
for c in tcp_server.clients)
2099
1895
@dbus.service.method(_interface,
2100
out_signature="a{oa{sv}}")
1896
out_signature=u"a{oa{sv}}")
2101
1897
def GetAllClientsWithProperties(self):
2103
1899
return dbus.Dictionary(
2104
((c.dbus_object_path, c.GetAll(""))
1900
((c.dbus_object_path, c.GetAll(u""))
2105
1901
for c in tcp_server.clients),
1902
signature=u"oa{sv}")
2108
@dbus.service.method(_interface, in_signature="o")
1904
@dbus.service.method(_interface, in_signature=u"o")
2109
1905
def RemoveClient(self, object_path):
2111
1907
for c in tcp_server.clients: