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")
159
raise AvahiServiceError(u"Too many renames")
163
160
self.name = unicode(self.server.GetAlternativeServiceName(self.name))
164
logger.info("Changing Zeroconf service name to %r ...",
161
logger.info(u"Changing Zeroconf service name to %r ...",
166
163
syslogger.setFormatter(logging.Formatter
167
('Mandos (%s) [%%(process)d]:'
168
' %%(levelname)s: %%(message)s'
164
(u'Mandos (%s) [%%(process)d]:'
165
u' %%(levelname)s: %%(message)s'
173
except dbus.exceptions.DBusException as error:
174
logger.critical("DBusException: %s", error)
170
except dbus.exceptions.DBusException, error:
171
logger.critical(u"DBusException: %s", error)
177
174
self.rename_count += 1
178
175
def remove(self):
179
176
"""Derived from the Avahi example code"""
180
if self.entry_group_state_changed_match is not None:
181
self.entry_group_state_changed_match.remove()
182
self.entry_group_state_changed_match = None
183
177
if self.group is not None:
184
178
self.group.Reset()
186
180
"""Derived from the Avahi example code"""
188
181
if self.group is None:
189
182
self.group = dbus.Interface(
190
183
self.bus.get_object(avahi.DBUS_NAME,
191
184
self.server.EntryGroupNew()),
192
185
avahi.DBUS_INTERFACE_ENTRY_GROUP)
193
self.entry_group_state_changed_match = (
194
self.group.connect_to_signal(
195
'StateChanged', self .entry_group_state_changed))
196
logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
186
self.group.connect_to_signal('StateChanged',
188
.entry_group_state_changed)
189
logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
197
190
self.name, self.type)
198
191
self.group.AddService(
206
199
self.group.Commit()
207
200
def entry_group_state_changed(self, state, error):
208
201
"""Derived from the Avahi example code"""
209
logger.debug("Avahi entry group state change: %i", state)
202
logger.debug(u"Avahi entry group state change: %i", state)
211
204
if state == avahi.ENTRY_GROUP_ESTABLISHED:
212
logger.debug("Zeroconf service established.")
205
logger.debug(u"Zeroconf service established.")
213
206
elif state == avahi.ENTRY_GROUP_COLLISION:
214
logger.info("Zeroconf service name collision.")
207
logger.warning(u"Zeroconf service name collision.")
216
209
elif state == avahi.ENTRY_GROUP_FAILURE:
217
logger.critical("Avahi: Error in group state changed %s",
210
logger.critical(u"Avahi: Error in group state changed %s",
219
raise AvahiGroupError("State changed: %s"
212
raise AvahiGroupError(u"State changed: %s"
220
213
% unicode(error))
221
214
def cleanup(self):
222
215
"""Derived from the Avahi example code"""
223
216
if self.group is not None:
226
except (dbus.exceptions.UnknownMethodException,
227
dbus.exceptions.DBusException) as e:
229
218
self.group = None
231
def server_state_changed(self, state, error=None):
219
def server_state_changed(self, state):
232
220
"""Derived from the Avahi example code"""
233
logger.debug("Avahi server state change: %i", state)
234
bad_states = { avahi.SERVER_INVALID:
235
"Zeroconf server invalid",
236
avahi.SERVER_REGISTERING: None,
237
avahi.SERVER_COLLISION:
238
"Zeroconf server name collision",
239
avahi.SERVER_FAILURE:
240
"Zeroconf server failure" }
241
if state in bad_states:
242
if bad_states[state] is not None:
244
logger.error(bad_states[state])
246
logger.error(bad_states[state] + ": %r", error)
221
logger.debug(u"Avahi server state change: %i", state)
222
if state == avahi.SERVER_COLLISION:
223
logger.error(u"Zeroconf server name collision")
248
225
elif state == avahi.SERVER_RUNNING:
252
logger.debug("Unknown state: %r", state)
254
logger.debug("Unknown state: %r: %r", state, error)
255
227
def activate(self):
256
228
"""Derived from the Avahi example code"""
257
229
if self.server is None:
258
230
self.server = dbus.Interface(
259
231
self.bus.get_object(avahi.DBUS_NAME,
260
avahi.DBUS_PATH_SERVER,
261
follow_name_owner_changes=True),
232
avahi.DBUS_PATH_SERVER),
262
233
avahi.DBUS_INTERFACE_SERVER)
263
self.server.connect_to_signal("StateChanged",
234
self.server.connect_to_signal(u"StateChanged",
264
235
self.server_state_changed)
265
236
self.server_state_changed(self.server.GetState())
268
def _timedelta_to_milliseconds(td):
269
"Convert a datetime.timedelta() to milliseconds"
270
return ((td.days * 24 * 60 * 60 * 1000)
271
+ (td.seconds * 1000)
272
+ (td.microseconds // 1000))
274
239
class Client(object):
275
240
"""A representation of a client host served by this server.
304
269
secret: bytestring; sent verbatim (over TLS) to client
305
270
timeout: datetime.timedelta(); How long from last_checked_ok
306
271
until this client is disabled
307
extended_timeout: extra long timeout when password has been sent
308
272
runtime_expansions: Allowed attributes for runtime expansion.
309
expires: datetime.datetime(); time (UTC) when a client will be
313
runtime_expansions = ("approval_delay", "approval_duration",
314
"created", "enabled", "fingerprint",
315
"host", "interval", "last_checked_ok",
316
"last_enabled", "name", "timeout")
275
runtime_expansions = (u"approval_delay", u"approval_duration",
276
u"created", u"enabled", u"fingerprint",
277
u"host", u"interval", u"last_checked_ok",
278
u"last_enabled", u"name", u"timeout")
281
def _timedelta_to_milliseconds(td):
282
"Convert a datetime.timedelta() to milliseconds"
283
return ((td.days * 24 * 60 * 60 * 1000)
284
+ (td.seconds * 1000)
285
+ (td.microseconds // 1000))
318
287
def timeout_milliseconds(self):
319
288
"Return the 'timeout' attribute in milliseconds"
320
return _timedelta_to_milliseconds(self.timeout)
322
def extended_timeout_milliseconds(self):
323
"Return the 'extended_timeout' attribute in milliseconds"
324
return _timedelta_to_milliseconds(self.extended_timeout)
289
return self._timedelta_to_milliseconds(self.timeout)
326
291
def interval_milliseconds(self):
327
292
"Return the 'interval' attribute in milliseconds"
328
return _timedelta_to_milliseconds(self.interval)
293
return self._timedelta_to_milliseconds(self.interval)
330
295
def approval_delay_milliseconds(self):
331
return _timedelta_to_milliseconds(self.approval_delay)
296
return self._timedelta_to_milliseconds(self.approval_delay)
333
298
def __init__(self, name = None, disable_hook=None, config=None):
334
299
"""Note: the 'checker' key in 'config' sets the
338
303
if config is None:
340
logger.debug("Creating client %r", self.name)
305
logger.debug(u"Creating client %r", self.name)
341
306
# Uppercase and remove spaces from fingerprint for later
342
307
# comparison purposes with return value from the fingerprint()
344
self.fingerprint = (config["fingerprint"].upper()
346
logger.debug(" Fingerprint: %s", self.fingerprint)
347
if "secret" in config:
348
self.secret = config["secret"].decode("base64")
349
elif "secfile" in config:
309
self.fingerprint = (config[u"fingerprint"].upper()
311
logger.debug(u" Fingerprint: %s", self.fingerprint)
312
if u"secret" in config:
313
self.secret = config[u"secret"].decode(u"base64")
314
elif u"secfile" in config:
350
315
with open(os.path.expanduser(os.path.expandvars
351
(config["secfile"])),
316
(config[u"secfile"])),
352
317
"rb") as secfile:
353
318
self.secret = secfile.read()
355
raise TypeError("No secret or secfile for client %s"
320
raise TypeError(u"No secret or secfile for client %s"
357
self.host = config.get("host", "")
322
self.host = config.get(u"host", u"")
358
323
self.created = datetime.datetime.utcnow()
359
324
self.enabled = False
360
325
self.last_approval_request = None
361
326
self.last_enabled = None
362
327
self.last_checked_ok = None
363
self.timeout = string_to_delta(config["timeout"])
364
self.extended_timeout = string_to_delta(config["extended_timeout"])
365
self.interval = string_to_delta(config["interval"])
328
self.timeout = string_to_delta(config[u"timeout"])
329
self.interval = string_to_delta(config[u"interval"])
366
330
self.disable_hook = disable_hook
367
331
self.checker = None
368
332
self.checker_initiator_tag = None
369
333
self.disable_initiator_tag = None
371
334
self.checker_callback_tag = None
372
self.checker_command = config["checker"]
335
self.checker_command = config[u"checker"]
373
336
self.current_checker_command = None
374
337
self.last_connect = None
375
338
self._approved = None
376
self.approved_by_default = config.get("approved_by_default",
339
self.approved_by_default = config.get(u"approved_by_default",
378
341
self.approvals_pending = 0
379
342
self.approval_delay = string_to_delta(
380
config["approval_delay"])
343
config[u"approval_delay"])
381
344
self.approval_duration = string_to_delta(
382
config["approval_duration"])
345
config[u"approval_duration"])
383
346
self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
385
348
def send_changedstate(self):
441
402
if os.WIFEXITED(condition):
442
403
exitstatus = os.WEXITSTATUS(condition)
443
404
if exitstatus == 0:
444
logger.info("Checker for %(name)s succeeded",
405
logger.info(u"Checker for %(name)s succeeded",
446
407
self.checked_ok()
448
logger.info("Checker for %(name)s failed",
409
logger.info(u"Checker for %(name)s failed",
451
logger.warning("Checker for %(name)s crashed?",
412
logger.warning(u"Checker for %(name)s crashed?",
454
def checked_ok(self, timeout=None):
415
def checked_ok(self):
455
416
"""Bump up the timeout for this client.
457
418
This should only be called when the client has been seen,
461
timeout = self.timeout
462
421
self.last_checked_ok = datetime.datetime.utcnow()
463
422
gobject.source_remove(self.disable_initiator_tag)
464
self.expires = datetime.datetime.utcnow() + timeout
465
423
self.disable_initiator_tag = (gobject.timeout_add
466
(_timedelta_to_milliseconds(timeout),
424
(self.timeout_milliseconds(),
469
427
def need_approval(self):
505
463
# Escape attributes for the shell
506
464
escaped_attrs = dict(
508
re.escape(unicode(str(getattr(self, attr, "")),
466
re.escape(unicode(str(getattr(self, attr, u"")),
512
470
self.runtime_expansions)
515
473
command = self.checker_command % escaped_attrs
516
except TypeError as error:
517
logger.error('Could not format string "%s":'
518
' %s', self.checker_command, error)
474
except TypeError, error:
475
logger.error(u'Could not format string "%s":'
476
u' %s', self.checker_command, error)
519
477
return True # Try again later
520
478
self.current_checker_command = command
522
logger.info("Starting checker %r for %s",
480
logger.info(u"Starting checker %r for %s",
523
481
command, self.name)
524
482
# We don't need to redirect stdout and stderr, since
525
483
# in normal mode, that is already done by daemon(),
549
507
if self.checker_callback_tag:
550
508
gobject.source_remove(self.checker_callback_tag)
551
509
self.checker_callback_tag = None
552
if getattr(self, "checker", None) is None:
510
if getattr(self, u"checker", None) is None:
554
logger.debug("Stopping checker for %(name)s", vars(self))
512
logger.debug(u"Stopping checker for %(name)s", vars(self))
556
514
os.kill(self.checker.pid, signal.SIGTERM)
558
516
#if self.checker.poll() is None:
559
517
# os.kill(self.checker.pid, signal.SIGKILL)
560
except OSError as error:
518
except OSError, error:
561
519
if error.errno != errno.ESRCH: # No such process
563
521
self.checker = None
566
def dbus_service_property(dbus_interface, signature="v",
567
access="readwrite", byte_arrays=False):
523
def dbus_service_property(dbus_interface, signature=u"v",
524
access=u"readwrite", byte_arrays=False):
568
525
"""Decorators for marking methods of a DBusObjectWithProperties to
569
526
become properties on the D-Bus.
631
588
for name, prop in
632
589
inspect.getmembers(self, self._is_dbus_property))
634
# def _get_dbus_property(self, interface_name, property_name):
635
# """Returns a bound method if one exists which is a D-Bus
636
# property with the specified name and interface.
638
# print("get_property({0!r}, {1!r}".format(interface_name, property_name),file=sys.stderr)
639
# print(dir(self), sys.stderr)
640
# for name in (property_name,
641
# property_name + "_dbus_property"):
642
# prop = getattr(self, name, None)
644
# or not self._is_dbus_property(prop)
645
# or prop._dbus_name != property_name
646
# or (interface_name and prop._dbus_interface
647
# and interface_name != prop._dbus_interface)):
651
# raise DBusPropertyNotFound(self.dbus_object_path + ":"
652
# + interface_name + "."
655
591
def _get_dbus_property(self, interface_name, property_name):
656
592
"""Returns a bound method if one exists which is a D-Bus
657
593
property with the specified name and interface.
659
for name, value in inspect.getmembers(self, self._is_dbus_property):
660
if value._dbus_name == property_name and value._dbus_interface == interface_name:
595
for name in (property_name,
596
property_name + u"_dbus_property"):
597
prop = getattr(self, name, None)
599
or not self._is_dbus_property(prop)
600
or prop._dbus_name != property_name
601
or (interface_name and prop._dbus_interface
602
and interface_name != prop._dbus_interface)):
663
605
# No such property
664
raise DBusPropertyNotFound(self.dbus_object_path + ":"
665
+ interface_name + "."
606
raise DBusPropertyNotFound(self.dbus_object_path + u":"
607
+ interface_name + u"."
669
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
610
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ss",
671
612
def Get(self, interface_name, property_name):
672
613
"""Standard D-Bus property Get() method, see D-Bus standard.
674
615
prop = self._get_dbus_property(interface_name, property_name)
675
if prop._dbus_access == "write":
616
if prop._dbus_access == u"write":
676
617
raise DBusPropertyAccessException(property_name)
678
if not hasattr(value, "variant_level"):
619
if not hasattr(value, u"variant_level"):
680
621
return type(value)(value, variant_level=value.variant_level+1)
682
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
623
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ssv")
683
624
def Set(self, interface_name, property_name, value):
684
625
"""Standard D-Bus property Set() method, see D-Bus standard.
686
627
prop = self._get_dbus_property(interface_name, property_name)
687
if prop._dbus_access == "read":
628
if prop._dbus_access == u"read":
688
629
raise DBusPropertyAccessException(property_name)
689
if prop._dbus_get_args_options["byte_arrays"]:
630
if prop._dbus_get_args_options[u"byte_arrays"]:
690
631
# The byte_arrays option is not supported yet on
691
632
# signatures other than "ay".
692
if prop._dbus_signature != "ay":
633
if prop._dbus_signature != u"ay":
694
635
value = dbus.ByteArray(''.join(unichr(byte)
695
636
for byte in value))
698
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
699
out_signature="a{sv}")
639
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"s",
640
out_signature=u"a{sv}")
700
641
def GetAll(self, interface_name):
701
642
"""Standard D-Bus property GetAll() method, see D-Bus
704
645
Note: Will not include properties with access="write".
733
674
document = xml.dom.minidom.parseString(xmlstring)
734
675
def make_tag(document, name, prop):
735
e = document.createElement("property")
736
e.setAttribute("name", name)
737
e.setAttribute("type", prop._dbus_signature)
738
e.setAttribute("access", prop._dbus_access)
676
e = document.createElement(u"property")
677
e.setAttribute(u"name", name)
678
e.setAttribute(u"type", prop._dbus_signature)
679
e.setAttribute(u"access", prop._dbus_access)
740
for if_tag in document.getElementsByTagName("interface"):
681
for if_tag in document.getElementsByTagName(u"interface"):
741
682
for tag in (make_tag(document, name, prop)
743
684
in self._get_all_dbus_properties()
744
685
if prop._dbus_interface
745
== if_tag.getAttribute("name")):
686
== if_tag.getAttribute(u"name")):
746
687
if_tag.appendChild(tag)
747
688
# Add the names to the return values for the
748
689
# "org.freedesktop.DBus.Properties" methods
749
if (if_tag.getAttribute("name")
750
== "org.freedesktop.DBus.Properties"):
751
for cn in if_tag.getElementsByTagName("method"):
752
if cn.getAttribute("name") == "Get":
753
for arg in cn.getElementsByTagName("arg"):
754
if (arg.getAttribute("direction")
756
arg.setAttribute("name", "value")
757
elif cn.getAttribute("name") == "GetAll":
758
for arg in cn.getElementsByTagName("arg"):
759
if (arg.getAttribute("direction")
761
arg.setAttribute("name", "props")
762
xmlstring = document.toxml("utf-8")
690
if (if_tag.getAttribute(u"name")
691
== u"org.freedesktop.DBus.Properties"):
692
for cn in if_tag.getElementsByTagName(u"method"):
693
if cn.getAttribute(u"name") == u"Get":
694
for arg in cn.getElementsByTagName(u"arg"):
695
if (arg.getAttribute(u"direction")
697
arg.setAttribute(u"name", u"value")
698
elif cn.getAttribute(u"name") == u"GetAll":
699
for arg in cn.getElementsByTagName(u"arg"):
700
if (arg.getAttribute(u"direction")
702
arg.setAttribute(u"name", u"props")
703
xmlstring = document.toxml(u"utf-8")
763
704
document.unlink()
764
705
except (AttributeError, xml.dom.DOMException,
765
xml.parsers.expat.ExpatError) as error:
766
logger.error("Failed to override Introspection method",
706
xml.parsers.expat.ExpatError), error:
707
logger.error(u"Failed to override Introspection method",
771
def datetime_to_dbus (dt, variant_level=0):
772
"""Convert a UTC datetime.datetime() to a D-Bus type."""
774
return dbus.String("", variant_level = variant_level)
775
return dbus.String(dt.isoformat(),
776
variant_level=variant_level)
778
class transitional_clientdbus(DBusObjectWithProperties.__metaclass__):
779
def __new__(mcs, name, bases, attr):
780
for key, old_dbusobj in attr.items():
781
new_interface = getattr(old_dbusobj, "_dbus_interface", "").replace("se.bsnet.fukt.", "se.recompile.")
782
if getattr(old_dbusobj, "_dbus_is_signal", False):
783
unwrappedfunc = dict(zip(old_dbusobj.func_code.co_freevars,
784
old_dbusobj.__closure__))["func"].cell_contents
785
newfunc = types.FunctionType(unwrappedfunc.func_code,
786
unwrappedfunc.func_globals,
787
unwrappedfunc.func_name,
788
unwrappedfunc.func_defaults,
789
unwrappedfunc.func_closure)
790
new_dbusfunc = dbus.service.signal(
791
new_interface, old_dbusobj._dbus_signature)(newfunc)
792
attr["_transitional_{0}_1".format(key)] = new_dbusfunc
793
attr["_transitional_{0}_0".format(key)] = old_dbusobj
794
def fixscope(func1, func2):
795
def newcall(*args, **kwargs):
796
func1(*args, **kwargs)
797
func2(*args, **kwargs)
800
attr[key] = fixscope(
801
old_dbusobj, attr["_transitional_{0}_1".format(key)])
803
if getattr(old_dbusobj, "_dbus_is_method", False):
804
new_dbusfunc = (dbus.service.method
806
old_dbusobj._dbus_in_signature,
807
old_dbusobj._dbus_out_signature)
809
(old_dbusobj.func_code,
810
old_dbusobj.func_globals,
811
old_dbusobj.func_name,
812
old_dbusobj.func_defaults,
813
old_dbusobj.func_closure)))
815
attr["_transitional_{0}".format(key)] = new_dbusfunc
816
if getattr(old_dbusobj, "_dbus_is_property", False):
817
new_dbusfunc = (dbus_service_property
819
old_dbusobj._dbus_signature,
820
old_dbusobj._dbus_access,
821
old_dbusobj._dbus_get_args_options["byte_arrays"])
823
(old_dbusobj.func_code,
824
old_dbusobj.func_globals,
825
old_dbusobj.func_name,
826
old_dbusobj.func_defaults,
827
old_dbusobj.func_closure)))
829
attr["_transitional_{0}".format(key)] = new_dbusfunc
830
return type.__new__(mcs, name, bases, attr)
832
712
class ClientDBus(Client, DBusObjectWithProperties):
833
713
"""A Client class using D-Bus
851
729
# Only now, when this client is initialized, can it show up on
853
731
client_object_name = unicode(self.name).translate(
732
{ord(u"."): ord(u"_"),
733
ord(u"-"): ord(u"_")})
856
734
self.dbus_object_path = (dbus.ObjectPath
857
("/clients/" + client_object_name))
735
(u"/clients/" + client_object_name))
858
736
DBusObjectWithProperties.__init__(self, self.bus,
859
737
self.dbus_object_path)
861
def notifychangeproperty(transform_func,
862
dbus_name, type_func=lambda x: x,
864
""" Modify a variable so that its a property that announce its
866
transform_fun: Function that takes a value and transform it to
868
dbus_name: DBus name of the variable
869
type_func: Function that transform the value before sending it
871
variant_level: DBus variant level. default: 1
874
def setter(self, value):
875
old_value = real_value[0]
876
real_value[0] = value
877
if hasattr(self, "dbus_object_path"):
878
if type_func(old_value) != type_func(real_value[0]):
879
dbus_value = transform_func(type_func(real_value[0]),
881
self.PropertyChanged(dbus.String(dbus_name),
884
return property(lambda self: real_value[0], setter)
887
expires = notifychangeproperty(datetime_to_dbus, "Expires")
888
approvals_pending = notifychangeproperty(dbus.Boolean,
891
enabled = notifychangeproperty(dbus.Boolean, "Enabled")
892
last_enabled = notifychangeproperty(datetime_to_dbus,
894
checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
895
type_func = lambda checker: checker is not None)
896
last_checked_ok = notifychangeproperty(datetime_to_dbus,
898
last_approval_request = notifychangeproperty(datetime_to_dbus,
899
"LastApprovalRequest")
900
approved_by_default = notifychangeproperty(dbus.Boolean,
902
approval_delay = notifychangeproperty(dbus.UInt16, "ApprovalDelay",
903
type_func = _timedelta_to_milliseconds)
904
approval_duration = notifychangeproperty(dbus.UInt16, "ApprovalDuration",
905
type_func = _timedelta_to_milliseconds)
906
host = notifychangeproperty(dbus.String, "Host")
907
timeout = notifychangeproperty(dbus.UInt16, "Timeout",
908
type_func = _timedelta_to_milliseconds)
909
extended_timeout = notifychangeproperty(dbus.UInt16, "ExtendedTimeout",
910
type_func = _timedelta_to_milliseconds)
911
interval = notifychangeproperty(dbus.UInt16, "Interval",
912
type_func = _timedelta_to_milliseconds)
913
checker_command = notifychangeproperty(dbus.String, "Checker")
915
del notifychangeproperty
739
def _get_approvals_pending(self):
740
return self._approvals_pending
741
def _set_approvals_pending(self, value):
742
old_value = self._approvals_pending
743
self._approvals_pending = value
745
if (hasattr(self, "dbus_object_path")
746
and bval is not bool(old_value)):
747
dbus_bool = dbus.Boolean(bval, variant_level=1)
748
self.PropertyChanged(dbus.String(u"ApprovalPending"),
751
approvals_pending = property(_get_approvals_pending,
752
_set_approvals_pending)
753
del _get_approvals_pending, _set_approvals_pending
756
def _datetime_to_dbus(dt, variant_level=0):
757
"""Convert a UTC datetime.datetime() to a D-Bus type."""
758
return dbus.String(dt.isoformat(),
759
variant_level=variant_level)
762
oldstate = getattr(self, u"enabled", False)
763
r = Client.enable(self)
764
if oldstate != self.enabled:
766
self.PropertyChanged(dbus.String(u"Enabled"),
767
dbus.Boolean(True, variant_level=1))
768
self.PropertyChanged(
769
dbus.String(u"LastEnabled"),
770
self._datetime_to_dbus(self.last_enabled,
774
def disable(self, quiet = False):
775
oldstate = getattr(self, u"enabled", False)
776
r = Client.disable(self, quiet=quiet)
777
if not quiet and oldstate != self.enabled:
779
self.PropertyChanged(dbus.String(u"Enabled"),
780
dbus.Boolean(False, variant_level=1))
917
783
def __del__(self, *args, **kwargs):
919
785
self.remove_from_connection()
920
786
except LookupError:
922
if hasattr(DBusObjectWithProperties, "__del__"):
788
if hasattr(DBusObjectWithProperties, u"__del__"):
923
789
DBusObjectWithProperties.__del__(self, *args, **kwargs)
924
790
Client.__del__(self, *args, **kwargs)
942
811
return Client.checker_callback(self, pid, condition, command,
814
def checked_ok(self, *args, **kwargs):
815
r = Client.checked_ok(self, *args, **kwargs)
817
self.PropertyChanged(
818
dbus.String(u"LastCheckedOK"),
819
(self._datetime_to_dbus(self.last_checked_ok,
823
def need_approval(self, *args, **kwargs):
824
r = Client.need_approval(self, *args, **kwargs)
826
self.PropertyChanged(
827
dbus.String(u"LastApprovalRequest"),
828
(self._datetime_to_dbus(self.last_approval_request,
945
832
def start_checker(self, *args, **kwargs):
946
833
old_checker = self.checker
947
834
if self.checker is not None:
963
862
def approve(self, value=True):
964
863
self.send_changedstate()
965
864
self._approved = value
966
gobject.timeout_add(_timedelta_to_milliseconds
865
gobject.timeout_add(self._timedelta_to_milliseconds
967
866
(self.approval_duration),
968
867
self._reset_approved)
971
870
## D-Bus methods, signals & properties
972
_interface = "se.bsnet.fukt.Mandos.Client"
871
_interface = u"se.bsnet.fukt.Mandos.Client"
976
875
# CheckerCompleted - signal
977
@dbus.service.signal(_interface, signature="nxs")
876
@dbus.service.signal(_interface, signature=u"nxs")
978
877
def CheckerCompleted(self, exitcode, waitstatus, command):
982
881
# CheckerStarted - signal
983
@dbus.service.signal(_interface, signature="s")
882
@dbus.service.signal(_interface, signature=u"s")
984
883
def CheckerStarted(self, command):
988
887
# PropertyChanged - signal
989
@dbus.service.signal(_interface, signature="sv")
888
@dbus.service.signal(_interface, signature=u"sv")
990
889
def PropertyChanged(self, property, value):
1052
951
# ApprovalPending - property
1053
@dbus_service_property(_interface, signature="b", access="read")
952
@dbus_service_property(_interface, signature=u"b", access=u"read")
1054
953
def ApprovalPending_dbus_property(self):
1055
954
return dbus.Boolean(bool(self.approvals_pending))
1057
956
# ApprovedByDefault - property
1058
@dbus_service_property(_interface, signature="b",
957
@dbus_service_property(_interface, signature=u"b",
1060
959
def ApprovedByDefault_dbus_property(self, value=None):
1061
960
if value is None: # get
1062
961
return dbus.Boolean(self.approved_by_default)
1063
962
self.approved_by_default = bool(value)
964
self.PropertyChanged(dbus.String(u"ApprovedByDefault"),
965
dbus.Boolean(value, variant_level=1))
1065
967
# ApprovalDelay - property
1066
@dbus_service_property(_interface, signature="t",
968
@dbus_service_property(_interface, signature=u"t",
1068
970
def ApprovalDelay_dbus_property(self, value=None):
1069
971
if value is None: # get
1070
972
return dbus.UInt64(self.approval_delay_milliseconds())
1071
973
self.approval_delay = datetime.timedelta(0, 0, 0, value)
975
self.PropertyChanged(dbus.String(u"ApprovalDelay"),
976
dbus.UInt64(value, variant_level=1))
1073
978
# ApprovalDuration - property
1074
@dbus_service_property(_interface, signature="t",
979
@dbus_service_property(_interface, signature=u"t",
1076
981
def ApprovalDuration_dbus_property(self, value=None):
1077
982
if value is None: # get
1078
return dbus.UInt64(_timedelta_to_milliseconds(
983
return dbus.UInt64(self._timedelta_to_milliseconds(
1079
984
self.approval_duration))
1080
985
self.approval_duration = datetime.timedelta(0, 0, 0, value)
987
self.PropertyChanged(dbus.String(u"ApprovalDuration"),
988
dbus.UInt64(value, variant_level=1))
1082
990
# Name - property
1083
@dbus_service_property(_interface, signature="s", access="read")
991
@dbus_service_property(_interface, signature=u"s", access=u"read")
1084
992
def Name_dbus_property(self):
1085
993
return dbus.String(self.name)
1087
995
# Fingerprint - property
1088
@dbus_service_property(_interface, signature="s", access="read")
996
@dbus_service_property(_interface, signature=u"s", access=u"read")
1089
997
def Fingerprint_dbus_property(self):
1090
998
return dbus.String(self.fingerprint)
1092
1000
# Host - property
1093
@dbus_service_property(_interface, signature="s",
1001
@dbus_service_property(_interface, signature=u"s",
1002
access=u"readwrite")
1095
1003
def Host_dbus_property(self, value=None):
1096
1004
if value is None: # get
1097
1005
return dbus.String(self.host)
1098
1006
self.host = value
1008
self.PropertyChanged(dbus.String(u"Host"),
1009
dbus.String(value, variant_level=1))
1100
1011
# Created - property
1101
@dbus_service_property(_interface, signature="s", access="read")
1012
@dbus_service_property(_interface, signature=u"s", access=u"read")
1102
1013
def Created_dbus_property(self):
1103
return dbus.String(datetime_to_dbus(self.created))
1014
return dbus.String(self._datetime_to_dbus(self.created))
1105
1016
# LastEnabled - property
1106
@dbus_service_property(_interface, signature="s", access="read")
1017
@dbus_service_property(_interface, signature=u"s", access=u"read")
1107
1018
def LastEnabled_dbus_property(self):
1108
return datetime_to_dbus(self.last_enabled)
1019
if self.last_enabled is None:
1020
return dbus.String(u"")
1021
return dbus.String(self._datetime_to_dbus(self.last_enabled))
1110
1023
# Enabled - property
1111
@dbus_service_property(_interface, signature="b",
1024
@dbus_service_property(_interface, signature=u"b",
1025
access=u"readwrite")
1113
1026
def Enabled_dbus_property(self, value=None):
1114
1027
if value is None: # get
1115
1028
return dbus.Boolean(self.enabled)
1121
1034
# LastCheckedOK - property
1122
@dbus_service_property(_interface, signature="s",
1035
@dbus_service_property(_interface, signature=u"s",
1036
access=u"readwrite")
1124
1037
def LastCheckedOK_dbus_property(self, value=None):
1125
1038
if value is not None:
1126
1039
self.checked_ok()
1128
return datetime_to_dbus(self.last_checked_ok)
1130
# Expires - property
1131
@dbus_service_property(_interface, signature="s", access="read")
1132
def Expires_dbus_property(self):
1133
return datetime_to_dbus(self.expires)
1041
if self.last_checked_ok is None:
1042
return dbus.String(u"")
1043
return dbus.String(self._datetime_to_dbus(self
1135
1046
# LastApprovalRequest - property
1136
@dbus_service_property(_interface, signature="s", access="read")
1047
@dbus_service_property(_interface, signature=u"s", access=u"read")
1137
1048
def LastApprovalRequest_dbus_property(self):
1138
return datetime_to_dbus(self.last_approval_request)
1049
if self.last_approval_request is None:
1050
return dbus.String(u"")
1051
return dbus.String(self.
1052
_datetime_to_dbus(self
1053
.last_approval_request))
1140
1055
# Timeout - property
1141
@dbus_service_property(_interface, signature="t",
1056
@dbus_service_property(_interface, signature=u"t",
1057
access=u"readwrite")
1143
1058
def Timeout_dbus_property(self, value=None):
1144
1059
if value is None: # get
1145
1060
return dbus.UInt64(self.timeout_milliseconds())
1146
1061
self.timeout = datetime.timedelta(0, 0, 0, value)
1147
if getattr(self, "disable_initiator_tag", None) is None:
1063
self.PropertyChanged(dbus.String(u"Timeout"),
1064
dbus.UInt64(value, variant_level=1))
1065
if getattr(self, u"disable_initiator_tag", None) is None:
1149
1067
# Reschedule timeout
1150
1068
gobject.source_remove(self.disable_initiator_tag)
1151
1069
self.disable_initiator_tag = None
1153
1070
time_to_die = (self.
1154
1071
_timedelta_to_milliseconds((self
1155
1072
.last_checked_ok
1160
1077
# The timeout has passed
1163
self.expires = (datetime.datetime.utcnow()
1164
+ datetime.timedelta(milliseconds = time_to_die))
1165
1080
self.disable_initiator_tag = (gobject.timeout_add
1166
1081
(time_to_die, self.disable))
1168
# ExtendedTimeout - property
1169
@dbus_service_property(_interface, signature="t",
1171
def ExtendedTimeout_dbus_property(self, value=None):
1172
if value is None: # get
1173
return dbus.UInt64(self.extended_timeout_milliseconds())
1174
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1176
1083
# Interval - property
1177
@dbus_service_property(_interface, signature="t",
1084
@dbus_service_property(_interface, signature=u"t",
1085
access=u"readwrite")
1179
1086
def Interval_dbus_property(self, value=None):
1180
1087
if value is None: # get
1181
1088
return dbus.UInt64(self.interval_milliseconds())
1182
1089
self.interval = datetime.timedelta(0, 0, 0, value)
1183
if getattr(self, "checker_initiator_tag", None) is None:
1091
self.PropertyChanged(dbus.String(u"Interval"),
1092
dbus.UInt64(value, variant_level=1))
1093
if getattr(self, u"checker_initiator_tag", None) is None:
1185
1095
# Reschedule checker run
1186
1096
gobject.source_remove(self.checker_initiator_tag)
1187
1097
self.checker_initiator_tag = (gobject.timeout_add
1188
1098
(value, self.start_checker))
1189
1099
self.start_checker() # Start one now, too
1191
1101
# Checker - property
1192
@dbus_service_property(_interface, signature="s",
1102
@dbus_service_property(_interface, signature=u"s",
1103
access=u"readwrite")
1194
1104
def Checker_dbus_property(self, value=None):
1195
1105
if value is None: # get
1196
1106
return dbus.String(self.checker_command)
1197
1107
self.checker_command = value
1109
self.PropertyChanged(dbus.String(u"Checker"),
1110
dbus.String(self.checker_command,
1199
1113
# CheckerRunning - property
1200
@dbus_service_property(_interface, signature="b",
1114
@dbus_service_property(_interface, signature=u"b",
1115
access=u"readwrite")
1202
1116
def CheckerRunning_dbus_property(self, value=None):
1203
1117
if value is None: # get
1204
1118
return dbus.Boolean(self.checker is not None)
1256
1170
def handle(self):
1257
1171
with contextlib.closing(self.server.child_pipe) as child_pipe:
1258
logger.info("TCP connection from: %s",
1172
logger.info(u"TCP connection from: %s",
1259
1173
unicode(self.client_address))
1260
logger.debug("Pipe FD: %d",
1174
logger.debug(u"Pipe FD: %d",
1261
1175
self.server.child_pipe.fileno())
1263
1177
session = (gnutls.connection
1264
1178
.ClientSession(self.request,
1265
1179
gnutls.connection
1266
1180
.X509Credentials()))
1268
1182
# Note: gnutls.connection.X509Credentials is really a
1269
1183
# generic GnuTLS certificate credentials object so long as
1270
1184
# no X.509 keys are added to it. Therefore, we can use it
1271
1185
# here despite using OpenPGP certificates.
1273
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1274
# "+AES-256-CBC", "+SHA1",
1275
# "+COMP-NULL", "+CTYPE-OPENPGP",
1187
#priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
1188
# u"+AES-256-CBC", u"+SHA1",
1189
# u"+COMP-NULL", u"+CTYPE-OPENPGP",
1277
1191
# Use a fallback default, since this MUST be set.
1278
1192
priority = self.server.gnutls_priority
1279
1193
if priority is None:
1194
priority = u"NORMAL"
1281
1195
(gnutls.library.functions
1282
1196
.gnutls_priority_set_direct(session._c_object,
1283
1197
priority, None))
1285
1199
# Start communication using the Mandos protocol
1286
1200
# Get protocol number
1287
1201
line = self.request.makefile().readline()
1288
logger.debug("Protocol version: %r", line)
1202
logger.debug(u"Protocol version: %r", line)
1290
1204
if int(line.strip().split()[0]) > 1:
1291
1205
raise RuntimeError
1292
except (ValueError, IndexError, RuntimeError) as error:
1293
logger.error("Unknown protocol version: %s", error)
1206
except (ValueError, IndexError, RuntimeError), error:
1207
logger.error(u"Unknown protocol version: %s", error)
1296
1210
# Start GnuTLS connection
1298
1212
session.handshake()
1299
except gnutls.errors.GNUTLSError as error:
1300
logger.warning("Handshake failed: %s", error)
1213
except gnutls.errors.GNUTLSError, error:
1214
logger.warning(u"Handshake failed: %s", error)
1301
1215
# Do not run session.bye() here: the session is not
1302
1216
# established. Just abandon the request.
1304
logger.debug("Handshake succeeded")
1218
logger.debug(u"Handshake succeeded")
1306
1220
approval_required = False
1309
1223
fpr = self.fingerprint(self.peer_certificate
1312
gnutls.errors.GNUTLSError) as error:
1313
logger.warning("Bad certificate: %s", error)
1225
except (TypeError, gnutls.errors.GNUTLSError), error:
1226
logger.warning(u"Bad certificate: %s", error)
1315
logger.debug("Fingerprint: %s", fpr)
1228
logger.debug(u"Fingerprint: %s", fpr)
1318
1231
client = ProxyClient(child_pipe, fpr,
1319
1232
self.client_address)
1521
1432
bind to an address or port if they were not specified."""
1522
1433
if self.interface is not None:
1523
1434
if SO_BINDTODEVICE is None:
1524
logger.error("SO_BINDTODEVICE does not exist;"
1525
" cannot bind to interface %s",
1435
logger.error(u"SO_BINDTODEVICE does not exist;"
1436
u" cannot bind to interface %s",
1526
1437
self.interface)
1529
1440
self.socket.setsockopt(socket.SOL_SOCKET,
1530
1441
SO_BINDTODEVICE,
1531
1442
str(self.interface
1533
except socket.error as error:
1444
except socket.error, error:
1534
1445
if error[0] == errno.EPERM:
1535
logger.error("No permission to"
1536
" bind to interface %s",
1446
logger.error(u"No permission to"
1447
u" bind to interface %s",
1537
1448
self.interface)
1538
1449
elif error[0] == errno.ENOPROTOOPT:
1539
logger.error("SO_BINDTODEVICE not available;"
1540
" cannot bind to interface %s",
1450
logger.error(u"SO_BINDTODEVICE not available;"
1451
u" cannot bind to interface %s",
1541
1452
self.interface)
1664
1575
attrname = request[1]
1665
1576
value = request[2]
1666
1577
setattr(client_object, attrname, value)
1671
1582
def string_to_delta(interval):
1672
1583
"""Parse a string and return a datetime.timedelta
1674
>>> string_to_delta('7d')
1585
>>> string_to_delta(u'7d')
1675
1586
datetime.timedelta(7)
1676
>>> string_to_delta('60s')
1587
>>> string_to_delta(u'60s')
1677
1588
datetime.timedelta(0, 60)
1678
>>> string_to_delta('60m')
1589
>>> string_to_delta(u'60m')
1679
1590
datetime.timedelta(0, 3600)
1680
>>> string_to_delta('24h')
1591
>>> string_to_delta(u'24h')
1681
1592
datetime.timedelta(1)
1682
>>> string_to_delta('1w')
1593
>>> string_to_delta(u'1w')
1683
1594
datetime.timedelta(7)
1684
>>> string_to_delta('5m 30s')
1595
>>> string_to_delta(u'5m 30s')
1685
1596
datetime.timedelta(0, 330)
1687
1598
timevalue = datetime.timedelta(0)
1714
1625
global if_nametoindex
1716
1627
if_nametoindex = (ctypes.cdll.LoadLibrary
1717
(ctypes.util.find_library("c"))
1628
(ctypes.util.find_library(u"c"))
1718
1629
.if_nametoindex)
1719
1630
except (OSError, AttributeError):
1720
logger.warning("Doing if_nametoindex the hard way")
1631
logger.warning(u"Doing if_nametoindex the hard way")
1721
1632
def if_nametoindex(interface):
1722
1633
"Get an interface index the hard way, i.e. using fcntl()"
1723
1634
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
1724
1635
with contextlib.closing(socket.socket()) as s:
1725
1636
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1726
struct.pack(str("16s16x"),
1637
struct.pack(str(u"16s16x"),
1728
interface_index = struct.unpack(str("I"),
1639
interface_index = struct.unpack(str(u"I"),
1729
1640
ifreq[16:20])[0]
1730
1641
return interface_index
1731
1642
return if_nametoindex(interface)
1761
1672
##################################################################
1762
1673
# Parsing of options, both command line and config file
1764
parser = argparse.ArgumentParser()
1765
parser.add_argument("-v", "--version", action="version",
1766
version = "%%(prog)s %s" % version,
1767
help="show version number and exit")
1768
parser.add_argument("-i", "--interface", metavar="IF",
1769
help="Bind to interface IF")
1770
parser.add_argument("-a", "--address",
1771
help="Address to listen for requests on")
1772
parser.add_argument("-p", "--port", type=int,
1773
help="Port number to receive requests on")
1774
parser.add_argument("--check", action="store_true",
1775
help="Run self-test")
1776
parser.add_argument("--debug", action="store_true",
1777
help="Debug mode; run in foreground and log"
1779
parser.add_argument("--debuglevel", metavar="LEVEL",
1780
help="Debug level for stdout output")
1781
parser.add_argument("--priority", help="GnuTLS"
1782
" priority string (see GnuTLS documentation)")
1783
parser.add_argument("--servicename",
1784
metavar="NAME", help="Zeroconf service name")
1785
parser.add_argument("--configdir",
1786
default="/etc/mandos", metavar="DIR",
1787
help="Directory to search for configuration"
1789
parser.add_argument("--no-dbus", action="store_false",
1790
dest="use_dbus", help="Do not provide D-Bus"
1791
" system bus interface")
1792
parser.add_argument("--no-ipv6", action="store_false",
1793
dest="use_ipv6", help="Do not use IPv6")
1794
options = parser.parse_args()
1675
parser = optparse.OptionParser(version = "%%prog %s" % version)
1676
parser.add_option("-i", u"--interface", type=u"string",
1677
metavar="IF", help=u"Bind to interface IF")
1678
parser.add_option("-a", u"--address", type=u"string",
1679
help=u"Address to listen for requests on")
1680
parser.add_option("-p", u"--port", type=u"int",
1681
help=u"Port number to receive requests on")
1682
parser.add_option("--check", action=u"store_true",
1683
help=u"Run self-test")
1684
parser.add_option("--debug", action=u"store_true",
1685
help=u"Debug mode; run in foreground and log to"
1687
parser.add_option("--debuglevel", type=u"string", metavar="LEVEL",
1688
help=u"Debug level for stdout output")
1689
parser.add_option("--priority", type=u"string", help=u"GnuTLS"
1690
u" priority string (see GnuTLS documentation)")
1691
parser.add_option("--servicename", type=u"string",
1692
metavar=u"NAME", help=u"Zeroconf service name")
1693
parser.add_option("--configdir", type=u"string",
1694
default=u"/etc/mandos", metavar=u"DIR",
1695
help=u"Directory to search for configuration"
1697
parser.add_option("--no-dbus", action=u"store_false",
1698
dest=u"use_dbus", help=u"Do not provide D-Bus"
1699
u" system bus interface")
1700
parser.add_option("--no-ipv6", action=u"store_false",
1701
dest=u"use_ipv6", help=u"Do not use IPv6")
1702
options = parser.parse_args()[0]
1796
1704
if options.check:
1801
1709
# Default values for config file for server-global settings
1802
server_defaults = { "interface": "",
1807
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1808
"servicename": "Mandos",
1710
server_defaults = { u"interface": u"",
1715
u"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1716
u"servicename": u"Mandos",
1717
u"use_dbus": u"True",
1718
u"use_ipv6": u"True",
1814
1722
# Parse config file for server-global settings
1815
1723
server_config = configparser.SafeConfigParser(server_defaults)
1816
1724
del server_defaults
1817
1725
server_config.read(os.path.join(options.configdir,
1819
1727
# Convert the SafeConfigParser object to a dict
1820
1728
server_settings = server_config.defaults()
1821
1729
# Use the appropriate methods on the non-string config options
1822
for option in ("debug", "use_dbus", "use_ipv6"):
1823
server_settings[option] = server_config.getboolean("DEFAULT",
1730
for option in (u"debug", u"use_dbus", u"use_ipv6"):
1731
server_settings[option] = server_config.getboolean(u"DEFAULT",
1825
1733
if server_settings["port"]:
1826
server_settings["port"] = server_config.getint("DEFAULT",
1734
server_settings["port"] = server_config.getint(u"DEFAULT",
1828
1736
del server_config
1830
1738
# Override the settings from the config file with command line
1831
1739
# options, if set.
1832
for option in ("interface", "address", "port", "debug",
1833
"priority", "servicename", "configdir",
1834
"use_dbus", "use_ipv6", "debuglevel"):
1740
for option in (u"interface", u"address", u"port", u"debug",
1741
u"priority", u"servicename", u"configdir",
1742
u"use_dbus", u"use_ipv6", u"debuglevel"):
1835
1743
value = getattr(options, option)
1836
1744
if value is not None:
1837
1745
server_settings[option] = value
1845
1753
##################################################################
1847
1755
# For convenience
1848
debug = server_settings["debug"]
1849
debuglevel = server_settings["debuglevel"]
1850
use_dbus = server_settings["use_dbus"]
1851
use_ipv6 = server_settings["use_ipv6"]
1853
if server_settings["servicename"] != "Mandos":
1756
debug = server_settings[u"debug"]
1757
debuglevel = server_settings[u"debuglevel"]
1758
use_dbus = server_settings[u"use_dbus"]
1759
use_ipv6 = server_settings[u"use_ipv6"]
1761
if server_settings[u"servicename"] != u"Mandos":
1854
1762
syslogger.setFormatter(logging.Formatter
1855
('Mandos (%s) [%%(process)d]:'
1856
' %%(levelname)s: %%(message)s'
1857
% server_settings["servicename"]))
1763
(u'Mandos (%s) [%%(process)d]:'
1764
u' %%(levelname)s: %%(message)s'
1765
% server_settings[u"servicename"]))
1859
1767
# Parse config file with clients
1860
client_defaults = { "timeout": "5m",
1861
"extended_timeout": "15m",
1863
"checker": "fping -q -- %%(host)s",
1865
"approval_delay": "0s",
1866
"approval_duration": "1s",
1768
client_defaults = { u"timeout": u"1h",
1770
u"checker": u"fping -q -- %%(host)s",
1772
u"approval_delay": u"0s",
1773
u"approval_duration": u"1s",
1868
1775
client_config = configparser.SafeConfigParser(client_defaults)
1869
client_config.read(os.path.join(server_settings["configdir"],
1776
client_config.read(os.path.join(server_settings[u"configdir"],
1872
1779
global mandos_dbus_service
1873
1780
mandos_dbus_service = None
1875
tcp_server = MandosServer((server_settings["address"],
1876
server_settings["port"]),
1782
tcp_server = MandosServer((server_settings[u"address"],
1783
server_settings[u"port"]),
1878
interface=(server_settings["interface"]
1785
interface=(server_settings[u"interface"]
1880
1787
use_ipv6=use_ipv6,
1881
1788
gnutls_priority=
1882
server_settings["priority"],
1789
server_settings[u"priority"],
1883
1790
use_dbus=use_dbus)
1885
pidfilename = "/var/run/mandos.pid"
1792
pidfilename = u"/var/run/mandos.pid"
1887
pidfile = open(pidfilename, "w")
1794
pidfile = open(pidfilename, u"w")
1888
1795
except IOError:
1889
logger.error("Could not open file %r", pidfilename)
1796
logger.error(u"Could not open file %r", pidfilename)
1892
uid = pwd.getpwnam("_mandos").pw_uid
1893
gid = pwd.getpwnam("_mandos").pw_gid
1799
uid = pwd.getpwnam(u"_mandos").pw_uid
1800
gid = pwd.getpwnam(u"_mandos").pw_gid
1894
1801
except KeyError:
1896
uid = pwd.getpwnam("mandos").pw_uid
1897
gid = pwd.getpwnam("mandos").pw_gid
1803
uid = pwd.getpwnam(u"mandos").pw_uid
1804
gid = pwd.getpwnam(u"mandos").pw_gid
1898
1805
except KeyError:
1900
uid = pwd.getpwnam("nobody").pw_uid
1901
gid = pwd.getpwnam("nobody").pw_gid
1807
uid = pwd.getpwnam(u"nobody").pw_uid
1808
gid = pwd.getpwnam(u"nobody").pw_gid
1902
1809
except KeyError:
1908
except OSError as error:
1815
except OSError, error:
1909
1816
if error[0] != errno.EPERM:
1953
1856
# End of Avahi example code
1956
bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
1957
bus, do_not_queue=True)
1958
bus_name2 = dbus.service.BusName("se.recompile.Mandos",
1959
bus, do_not_queue=True)
1960
except dbus.exceptions.NameExistsException as e:
1961
logger.error(unicode(e) + ", disabling D-Bus")
1859
bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos",
1860
bus, do_not_queue=True)
1861
except dbus.exceptions.NameExistsException, e:
1862
logger.error(unicode(e) + u", disabling D-Bus")
1962
1863
use_dbus = False
1963
server_settings["use_dbus"] = False
1864
server_settings[u"use_dbus"] = False
1964
1865
tcp_server.use_dbus = False
1965
1866
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1966
service = AvahiService(name = server_settings["servicename"],
1967
servicetype = "_mandos._tcp",
1867
service = AvahiService(name = server_settings[u"servicename"],
1868
servicetype = u"_mandos._tcp",
1968
1869
protocol = protocol, bus = bus)
1969
1870
if server_settings["interface"]:
1970
1871
service.interface = (if_nametoindex
1971
(str(server_settings["interface"])))
1872
(str(server_settings[u"interface"])))
1875
# Close all input and output, do double fork, etc.
1973
1878
global multiprocessing_manager
1974
1879
multiprocessing_manager = multiprocessing.Manager()
2019
1924
class MandosDBusService(dbus.service.Object):
2020
1925
"""A D-Bus proxy object"""
2021
1926
def __init__(self):
2022
dbus.service.Object.__init__(self, bus, "/")
2023
_interface = "se.bsnet.fukt.Mandos"
1927
dbus.service.Object.__init__(self, bus, u"/")
1928
_interface = u"se.bsnet.fukt.Mandos"
2025
@dbus.service.signal(_interface, signature="o")
1930
@dbus.service.signal(_interface, signature=u"o")
2026
1931
def ClientAdded(self, objpath):
2030
@dbus.service.signal(_interface, signature="ss")
1935
@dbus.service.signal(_interface, signature=u"ss")
2031
1936
def ClientNotFound(self, fingerprint, address):
2035
@dbus.service.signal(_interface, signature="os")
1940
@dbus.service.signal(_interface, signature=u"os")
2036
1941
def ClientRemoved(self, objpath, name):
2040
@dbus.service.method(_interface, out_signature="ao")
1945
@dbus.service.method(_interface, out_signature=u"ao")
2041
1946
def GetAllClients(self):
2043
1948
return dbus.Array(c.dbus_object_path
2044
1949
for c in tcp_server.clients)
2046
1951
@dbus.service.method(_interface,
2047
out_signature="a{oa{sv}}")
1952
out_signature=u"a{oa{sv}}")
2048
1953
def GetAllClientsWithProperties(self):
2050
1955
return dbus.Dictionary(
2051
((c.dbus_object_path, c.GetAll(""))
1956
((c.dbus_object_path, c.GetAll(u""))
2052
1957
for c in tcp_server.clients),
1958
signature=u"oa{sv}")
2055
@dbus.service.method(_interface, in_signature="o")
1960
@dbus.service.method(_interface, in_signature=u"o")
2056
1961
def RemoveClient(self, object_path):
2058
1963
for c in tcp_server.clients: