150
151
self.group = None # our entry group
151
152
self.server = None
154
self.entry_group_state_changed_match = None
153
155
def rename(self):
154
156
"""Derived from the Avahi example code"""
155
157
if self.rename_count >= self.max_renames:
156
logger.critical(u"No suitable Zeroconf service name found"
157
u" after %i retries, exiting.",
158
logger.critical("No suitable Zeroconf service name found"
159
" after %i retries, exiting.",
158
160
self.rename_count)
159
raise AvahiServiceError(u"Too many renames")
161
raise AvahiServiceError("Too many renames")
160
162
self.name = unicode(self.server.GetAlternativeServiceName(self.name))
161
logger.info(u"Changing Zeroconf service name to %r ...",
163
logger.info("Changing Zeroconf service name to %r ...",
163
165
syslogger.setFormatter(logging.Formatter
164
(u'Mandos (%s) [%%(process)d]:'
165
u' %%(levelname)s: %%(message)s'
166
('Mandos (%s) [%%(process)d]:'
167
' %%(levelname)s: %%(message)s'
170
except dbus.exceptions.DBusException, error:
171
logger.critical(u"DBusException: %s", error)
172
except dbus.exceptions.DBusException as error:
173
logger.critical("DBusException: %s", error)
174
176
self.rename_count += 1
175
177
def remove(self):
176
178
"""Derived from the Avahi example code"""
179
if self.entry_group_state_changed_match is not None:
180
self.entry_group_state_changed_match.remove()
181
self.entry_group_state_changed_match = None
177
182
if self.group is not None:
178
183
self.group.Reset()
180
185
"""Derived from the Avahi example code"""
181
187
if self.group is None:
182
188
self.group = dbus.Interface(
183
189
self.bus.get_object(avahi.DBUS_NAME,
184
190
self.server.EntryGroupNew()),
185
191
avahi.DBUS_INTERFACE_ENTRY_GROUP)
186
self.group.connect_to_signal('StateChanged',
188
.entry_group_state_changed)
189
logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
192
self.entry_group_state_changed_match = (
193
self.group.connect_to_signal(
194
'StateChanged', self .entry_group_state_changed))
195
logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
190
196
self.name, self.type)
191
197
self.group.AddService(
199
205
self.group.Commit()
200
206
def entry_group_state_changed(self, state, error):
201
207
"""Derived from the Avahi example code"""
202
logger.debug(u"Avahi entry group state change: %i", state)
208
logger.debug("Avahi entry group state change: %i", state)
204
210
if state == avahi.ENTRY_GROUP_ESTABLISHED:
205
logger.debug(u"Zeroconf service established.")
211
logger.debug("Zeroconf service established.")
206
212
elif state == avahi.ENTRY_GROUP_COLLISION:
207
logger.warning(u"Zeroconf service name collision.")
213
logger.info("Zeroconf service name collision.")
209
215
elif state == avahi.ENTRY_GROUP_FAILURE:
210
logger.critical(u"Avahi: Error in group state changed %s",
216
logger.critical("Avahi: Error in group state changed %s",
212
raise AvahiGroupError(u"State changed: %s"
218
raise AvahiGroupError("State changed: %s"
213
219
% unicode(error))
214
220
def cleanup(self):
215
221
"""Derived from the Avahi example code"""
216
222
if self.group is not None:
225
except (dbus.exceptions.UnknownMethodException,
226
dbus.exceptions.DBusException) as e:
218
228
self.group = None
219
def server_state_changed(self, state):
230
def server_state_changed(self, state, error=None):
220
231
"""Derived from the Avahi example code"""
221
logger.debug(u"Avahi server state change: %i", state)
222
if state == avahi.SERVER_COLLISION:
223
logger.error(u"Zeroconf server name collision")
232
logger.debug("Avahi server state change: %i", state)
233
bad_states = { avahi.SERVER_INVALID:
234
"Zeroconf server invalid",
235
avahi.SERVER_REGISTERING: None,
236
avahi.SERVER_COLLISION:
237
"Zeroconf server name collision",
238
avahi.SERVER_FAILURE:
239
"Zeroconf server failure" }
240
if state in bad_states:
241
if bad_states[state] is not None:
243
logger.error(bad_states[state])
245
logger.error(bad_states[state] + ": %r", error)
225
247
elif state == avahi.SERVER_RUNNING:
251
logger.debug("Unknown state: %r", state)
253
logger.debug("Unknown state: %r: %r", state, error)
227
254
def activate(self):
228
255
"""Derived from the Avahi example code"""
229
256
if self.server is None:
230
257
self.server = dbus.Interface(
231
258
self.bus.get_object(avahi.DBUS_NAME,
232
avahi.DBUS_PATH_SERVER),
259
avahi.DBUS_PATH_SERVER,
260
follow_name_owner_changes=True),
233
261
avahi.DBUS_INTERFACE_SERVER)
234
self.server.connect_to_signal(u"StateChanged",
262
self.server.connect_to_signal("StateChanged",
235
263
self.server_state_changed)
236
264
self.server_state_changed(self.server.GetState())
267
def _timedelta_to_milliseconds(td):
268
"Convert a datetime.timedelta() to milliseconds"
269
return ((td.days * 24 * 60 * 60 * 1000)
270
+ (td.seconds * 1000)
271
+ (td.microseconds // 1000))
239
273
class Client(object):
240
274
"""A representation of a client host served by this server.
268
303
secret: bytestring; sent verbatim (over TLS) to client
269
304
timeout: datetime.timedelta(); How long from last_checked_ok
270
305
until this client is disabled
306
extended_timeout: extra long timeout when password has been sent
271
307
runtime_expansions: Allowed attributes for runtime expansion.
308
expires: datetime.datetime(); time (UTC) when a client will be
274
runtime_expansions = (u"approval_delay", u"approval_duration",
275
u"created", u"enabled", u"fingerprint",
276
u"host", u"interval", u"last_checked_ok",
277
u"last_enabled", u"name", u"timeout")
280
def _timedelta_to_milliseconds(td):
281
"Convert a datetime.timedelta() to milliseconds"
282
return ((td.days * 24 * 60 * 60 * 1000)
283
+ (td.seconds * 1000)
284
+ (td.microseconds // 1000))
312
runtime_expansions = ("approval_delay", "approval_duration",
313
"created", "enabled", "fingerprint",
314
"host", "interval", "last_checked_ok",
315
"last_enabled", "name", "timeout")
286
317
def timeout_milliseconds(self):
287
318
"Return the 'timeout' attribute in milliseconds"
288
return self._timedelta_to_milliseconds(self.timeout)
319
return _timedelta_to_milliseconds(self.timeout)
321
def extended_timeout_milliseconds(self):
322
"Return the 'extended_timeout' attribute in milliseconds"
323
return _timedelta_to_milliseconds(self.extended_timeout)
290
325
def interval_milliseconds(self):
291
326
"Return the 'interval' attribute in milliseconds"
292
return self._timedelta_to_milliseconds(self.interval)
327
return _timedelta_to_milliseconds(self.interval)
294
329
def approval_delay_milliseconds(self):
295
return self._timedelta_to_milliseconds(self.approval_delay)
330
return _timedelta_to_milliseconds(self.approval_delay)
297
332
def __init__(self, name = None, disable_hook=None, config=None):
298
333
"""Note: the 'checker' key in 'config' sets the
302
337
if config is None:
304
logger.debug(u"Creating client %r", self.name)
339
logger.debug("Creating client %r", self.name)
305
340
# Uppercase and remove spaces from fingerprint for later
306
341
# comparison purposes with return value from the fingerprint()
308
self.fingerprint = (config[u"fingerprint"].upper()
310
logger.debug(u" Fingerprint: %s", self.fingerprint)
311
if u"secret" in config:
312
self.secret = config[u"secret"].decode(u"base64")
313
elif u"secfile" in config:
343
self.fingerprint = (config["fingerprint"].upper()
345
logger.debug(" Fingerprint: %s", self.fingerprint)
346
if "secret" in config:
347
self.secret = config["secret"].decode("base64")
348
elif "secfile" in config:
314
349
with open(os.path.expanduser(os.path.expandvars
315
(config[u"secfile"])),
350
(config["secfile"])),
316
351
"rb") as secfile:
317
352
self.secret = secfile.read()
319
raise TypeError(u"No secret or secfile for client %s"
354
raise TypeError("No secret or secfile for client %s"
321
self.host = config.get(u"host", u"")
356
self.host = config.get("host", "")
322
357
self.created = datetime.datetime.utcnow()
323
358
self.enabled = False
359
self.last_approval_request = None
324
360
self.last_enabled = None
325
361
self.last_checked_ok = None
326
self.timeout = string_to_delta(config[u"timeout"])
327
self.interval = string_to_delta(config[u"interval"])
362
self.timeout = string_to_delta(config["timeout"])
363
self.extended_timeout = string_to_delta(config["extended_timeout"])
364
self.interval = string_to_delta(config["interval"])
328
365
self.disable_hook = disable_hook
329
366
self.checker = None
330
367
self.checker_initiator_tag = None
331
368
self.disable_initiator_tag = None
332
370
self.checker_callback_tag = None
333
self.checker_command = config[u"checker"]
371
self.checker_command = config["checker"]
334
372
self.current_checker_command = None
335
373
self.last_connect = None
336
374
self._approved = None
337
self.approved_by_default = config.get(u"approved_by_default",
375
self.approved_by_default = config.get("approved_by_default",
339
377
self.approvals_pending = 0
340
378
self.approval_delay = string_to_delta(
341
config[u"approval_delay"])
379
config["approval_delay"])
342
380
self.approval_duration = string_to_delta(
343
config[u"approval_duration"])
381
config["approval_duration"])
344
382
self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
346
384
def send_changedstate(self):
351
389
def enable(self):
352
390
"""Start this client's checker and timeout hooks"""
353
if getattr(self, u"enabled", False):
391
if getattr(self, "enabled", False):
354
392
# Already enabled
356
394
self.send_changedstate()
357
self.last_enabled = datetime.datetime.utcnow()
358
395
# Schedule a new checker to be started an 'interval' from now,
359
396
# and every interval from then on.
360
397
self.checker_initiator_tag = (gobject.timeout_add
361
398
(self.interval_milliseconds(),
362
399
self.start_checker))
363
400
# Schedule a disable() when 'timeout' has passed
401
self.expires = datetime.datetime.utcnow() + self.timeout
364
402
self.disable_initiator_tag = (gobject.timeout_add
365
403
(self.timeout_milliseconds(),
367
405
self.enabled = True
406
self.last_enabled = datetime.datetime.utcnow()
368
407
# Also start a new checker *right now*.
369
408
self.start_checker()
400
440
if os.WIFEXITED(condition):
401
441
exitstatus = os.WEXITSTATUS(condition)
402
442
if exitstatus == 0:
403
logger.info(u"Checker for %(name)s succeeded",
443
logger.info("Checker for %(name)s succeeded",
405
445
self.checked_ok()
407
logger.info(u"Checker for %(name)s failed",
447
logger.info("Checker for %(name)s failed",
410
logger.warning(u"Checker for %(name)s crashed?",
450
logger.warning("Checker for %(name)s crashed?",
413
def checked_ok(self):
453
def checked_ok(self, timeout=None):
414
454
"""Bump up the timeout for this client.
416
456
This should only be called when the client has been seen,
460
timeout = self.timeout
419
461
self.last_checked_ok = datetime.datetime.utcnow()
420
462
gobject.source_remove(self.disable_initiator_tag)
463
self.expires = datetime.datetime.utcnow() + timeout
421
464
self.disable_initiator_tag = (gobject.timeout_add
422
(self.timeout_milliseconds(),
465
(_timedelta_to_milliseconds(timeout),
468
def need_approval(self):
469
self.last_approval_request = datetime.datetime.utcnow()
425
471
def start_checker(self):
426
472
"""Start a new checker subprocess if one is not running.
458
504
# Escape attributes for the shell
459
505
escaped_attrs = dict(
461
re.escape(unicode(str(getattr(self, attr, u"")),
507
re.escape(unicode(str(getattr(self, attr, "")),
465
511
self.runtime_expansions)
468
514
command = self.checker_command % escaped_attrs
469
except TypeError, error:
470
logger.error(u'Could not format string "%s":'
471
u' %s', self.checker_command, error)
515
except TypeError as error:
516
logger.error('Could not format string "%s":'
517
' %s', self.checker_command, error)
472
518
return True # Try again later
473
519
self.current_checker_command = command
475
logger.info(u"Starting checker %r for %s",
521
logger.info("Starting checker %r for %s",
476
522
command, self.name)
477
523
# We don't need to redirect stdout and stderr, since
478
524
# in normal mode, that is already done by daemon(),
502
548
if self.checker_callback_tag:
503
549
gobject.source_remove(self.checker_callback_tag)
504
550
self.checker_callback_tag = None
505
if getattr(self, u"checker", None) is None:
551
if getattr(self, "checker", None) is None:
507
logger.debug(u"Stopping checker for %(name)s", vars(self))
553
logger.debug("Stopping checker for %(name)s", vars(self))
509
555
os.kill(self.checker.pid, signal.SIGTERM)
511
557
#if self.checker.poll() is None:
512
558
# os.kill(self.checker.pid, signal.SIGKILL)
513
except OSError, error:
559
except OSError as error:
514
560
if error.errno != errno.ESRCH: # No such process
516
562
self.checker = None
518
def dbus_service_property(dbus_interface, signature=u"v",
519
access=u"readwrite", byte_arrays=False):
564
def dbus_service_property(dbus_interface, signature="v",
565
access="readwrite", byte_arrays=False):
520
566
"""Decorators for marking methods of a DBusObjectWithProperties to
521
567
become properties on the D-Bus.
530
576
# Encoding deeply encoded byte arrays is not supported yet by the
531
577
# "Set" method, so we fail early here:
532
if byte_arrays and signature != u"ay":
533
raise ValueError(u"Byte arrays not supported for non-'ay'"
534
u" signature %r" % signature)
578
if byte_arrays and signature != "ay":
579
raise ValueError("Byte arrays not supported for non-'ay'"
580
" signature %r" % signature)
535
581
def decorator(func):
536
582
func._dbus_is_property = True
537
583
func._dbus_interface = dbus_interface
538
584
func._dbus_signature = signature
539
585
func._dbus_access = access
540
586
func._dbus_name = func.__name__
541
if func._dbus_name.endswith(u"_dbus_property"):
587
if func._dbus_name.endswith("_dbus_property"):
542
588
func._dbus_name = func._dbus_name[:-14]
543
func._dbus_get_args_options = {u'byte_arrays': byte_arrays }
589
func._dbus_get_args_options = {'byte_arrays': byte_arrays }
600
646
# No such property
601
raise DBusPropertyNotFound(self.dbus_object_path + u":"
602
+ interface_name + u"."
647
raise DBusPropertyNotFound(self.dbus_object_path + ":"
648
+ interface_name + "."
605
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ss",
651
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
607
653
def Get(self, interface_name, property_name):
608
654
"""Standard D-Bus property Get() method, see D-Bus standard.
610
656
prop = self._get_dbus_property(interface_name, property_name)
611
if prop._dbus_access == u"write":
657
if prop._dbus_access == "write":
612
658
raise DBusPropertyAccessException(property_name)
614
if not hasattr(value, u"variant_level"):
660
if not hasattr(value, "variant_level"):
616
662
return type(value)(value, variant_level=value.variant_level+1)
618
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ssv")
664
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
619
665
def Set(self, interface_name, property_name, value):
620
666
"""Standard D-Bus property Set() method, see D-Bus standard.
622
668
prop = self._get_dbus_property(interface_name, property_name)
623
if prop._dbus_access == u"read":
669
if prop._dbus_access == "read":
624
670
raise DBusPropertyAccessException(property_name)
625
if prop._dbus_get_args_options[u"byte_arrays"]:
671
if prop._dbus_get_args_options["byte_arrays"]:
626
672
# The byte_arrays option is not supported yet on
627
673
# signatures other than "ay".
628
if prop._dbus_signature != u"ay":
674
if prop._dbus_signature != "ay":
630
676
value = dbus.ByteArray(''.join(unichr(byte)
631
677
for byte in value))
634
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"s",
635
out_signature=u"a{sv}")
680
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
681
out_signature="a{sv}")
636
682
def GetAll(self, interface_name):
637
683
"""Standard D-Bus property GetAll() method, see D-Bus
646
692
# Interface non-empty but did not match
648
694
# Ignore write-only properties
649
if prop._dbus_access == u"write":
695
if prop._dbus_access == "write":
652
if not hasattr(value, u"variant_level"):
698
if not hasattr(value, "variant_level"):
653
699
all[name] = value
655
701
all[name] = type(value)(value, variant_level=
656
702
value.variant_level+1)
657
return dbus.Dictionary(all, signature=u"sv")
703
return dbus.Dictionary(all, signature="sv")
659
705
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
661
707
path_keyword='object_path',
662
708
connection_keyword='connection')
663
709
def Introspect(self, object_path, connection):
669
715
document = xml.dom.minidom.parseString(xmlstring)
670
716
def make_tag(document, name, prop):
671
e = document.createElement(u"property")
672
e.setAttribute(u"name", name)
673
e.setAttribute(u"type", prop._dbus_signature)
674
e.setAttribute(u"access", prop._dbus_access)
717
e = document.createElement("property")
718
e.setAttribute("name", name)
719
e.setAttribute("type", prop._dbus_signature)
720
e.setAttribute("access", prop._dbus_access)
676
for if_tag in document.getElementsByTagName(u"interface"):
722
for if_tag in document.getElementsByTagName("interface"):
677
723
for tag in (make_tag(document, name, prop)
679
725
in self._get_all_dbus_properties()
680
726
if prop._dbus_interface
681
== if_tag.getAttribute(u"name")):
727
== if_tag.getAttribute("name")):
682
728
if_tag.appendChild(tag)
683
729
# Add the names to the return values for the
684
730
# "org.freedesktop.DBus.Properties" methods
685
if (if_tag.getAttribute(u"name")
686
== u"org.freedesktop.DBus.Properties"):
687
for cn in if_tag.getElementsByTagName(u"method"):
688
if cn.getAttribute(u"name") == u"Get":
689
for arg in cn.getElementsByTagName(u"arg"):
690
if (arg.getAttribute(u"direction")
692
arg.setAttribute(u"name", u"value")
693
elif cn.getAttribute(u"name") == u"GetAll":
694
for arg in cn.getElementsByTagName(u"arg"):
695
if (arg.getAttribute(u"direction")
697
arg.setAttribute(u"name", u"props")
698
xmlstring = document.toxml(u"utf-8")
731
if (if_tag.getAttribute("name")
732
== "org.freedesktop.DBus.Properties"):
733
for cn in if_tag.getElementsByTagName("method"):
734
if cn.getAttribute("name") == "Get":
735
for arg in cn.getElementsByTagName("arg"):
736
if (arg.getAttribute("direction")
738
arg.setAttribute("name", "value")
739
elif cn.getAttribute("name") == "GetAll":
740
for arg in cn.getElementsByTagName("arg"):
741
if (arg.getAttribute("direction")
743
arg.setAttribute("name", "props")
744
xmlstring = document.toxml("utf-8")
699
745
document.unlink()
700
746
except (AttributeError, xml.dom.DOMException,
701
xml.parsers.expat.ExpatError), error:
702
logger.error(u"Failed to override Introspection method",
747
xml.parsers.expat.ExpatError) as error:
748
logger.error("Failed to override Introspection method",
753
def datetime_to_dbus (dt, variant_level=0):
754
"""Convert a UTC datetime.datetime() to a D-Bus type."""
756
return dbus.String("", variant_level = variant_level)
757
return dbus.String(dt.isoformat(),
758
variant_level=variant_level)
707
760
class ClientDBus(Client, DBusObjectWithProperties):
708
761
"""A Client class using D-Bus
724
777
# Only now, when this client is initialized, can it show up on
726
779
client_object_name = unicode(self.name).translate(
727
{ord(u"."): ord(u"_"),
728
ord(u"-"): ord(u"_")})
729
782
self.dbus_object_path = (dbus.ObjectPath
730
(u"/clients/" + client_object_name))
783
("/clients/" + client_object_name))
731
784
DBusObjectWithProperties.__init__(self, self.bus,
732
785
self.dbus_object_path)
734
def _get_approvals_pending(self):
735
return self._approvals_pending
736
def _set_approvals_pending(self, value):
737
old_value = self._approvals_pending
738
self._approvals_pending = value
740
if (hasattr(self, "dbus_object_path")
741
and bval is not bool(old_value)):
742
dbus_bool = dbus.Boolean(bval, variant_level=1)
743
self.PropertyChanged(dbus.String(u"ApprovalPending"),
746
approvals_pending = property(_get_approvals_pending,
747
_set_approvals_pending)
748
del _get_approvals_pending, _set_approvals_pending
751
def _datetime_to_dbus(dt, variant_level=0):
752
"""Convert a UTC datetime.datetime() to a D-Bus type."""
753
return dbus.String(dt.isoformat(),
754
variant_level=variant_level)
757
oldstate = getattr(self, u"enabled", False)
758
r = Client.enable(self)
759
if oldstate != self.enabled:
761
self.PropertyChanged(dbus.String(u"Enabled"),
762
dbus.Boolean(True, variant_level=1))
763
self.PropertyChanged(
764
dbus.String(u"LastEnabled"),
765
self._datetime_to_dbus(self.last_enabled,
769
def disable(self, quiet = False):
770
oldstate = getattr(self, u"enabled", False)
771
r = Client.disable(self, quiet=quiet)
772
if not quiet and oldstate != self.enabled:
774
self.PropertyChanged(dbus.String(u"Enabled"),
775
dbus.Boolean(False, variant_level=1))
787
def notifychangeproperty(transform_func,
788
dbus_name, type_func=lambda x: x,
790
""" Modify a variable so that its a property that announce its
792
transform_fun: Function that takes a value and transform it to
794
dbus_name: DBus name of the variable
795
type_func: Function that transform the value before sending it
797
variant_level: DBus variant level. default: 1
800
def setter(self, value):
801
old_value = real_value[0]
802
real_value[0] = value
803
if hasattr(self, "dbus_object_path"):
804
if type_func(old_value) != type_func(real_value[0]):
805
dbus_value = transform_func(type_func(real_value[0]),
807
self.PropertyChanged(dbus.String(dbus_name),
810
return property(lambda self: real_value[0], setter)
813
expires = notifychangeproperty(datetime_to_dbus, "Expires")
814
approvals_pending = notifychangeproperty(dbus.Boolean,
817
enabled = notifychangeproperty(dbus.Boolean, "Enabled")
818
last_enabled = notifychangeproperty(datetime_to_dbus,
820
checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
821
type_func = lambda checker: checker is not None)
822
last_checked_ok = notifychangeproperty(datetime_to_dbus,
824
last_approval_request = notifychangeproperty(datetime_to_dbus,
825
"LastApprovalRequest")
826
approved_by_default = notifychangeproperty(dbus.Boolean,
828
approval_delay = notifychangeproperty(dbus.UInt16, "ApprovalDelay",
829
type_func = _timedelta_to_milliseconds)
830
approval_duration = notifychangeproperty(dbus.UInt16, "ApprovalDuration",
831
type_func = _timedelta_to_milliseconds)
832
host = notifychangeproperty(dbus.String, "Host")
833
timeout = notifychangeproperty(dbus.UInt16, "Timeout",
834
type_func = _timedelta_to_milliseconds)
835
extended_timeout = notifychangeproperty(dbus.UInt16, "ExtendedTimeout",
836
type_func = _timedelta_to_milliseconds)
837
interval = notifychangeproperty(dbus.UInt16, "Interval",
838
type_func = _timedelta_to_milliseconds)
839
checker_command = notifychangeproperty(dbus.String, "Checker")
841
del notifychangeproperty
778
843
def __del__(self, *args, **kwargs):
780
845
self.remove_from_connection()
781
846
except LookupError:
783
if hasattr(DBusObjectWithProperties, u"__del__"):
848
if hasattr(DBusObjectWithProperties, "__del__"):
784
849
DBusObjectWithProperties.__del__(self, *args, **kwargs)
785
850
Client.__del__(self, *args, **kwargs)
827
880
and old_checker_pid != self.checker.pid):
828
881
# Emit D-Bus signal
829
882
self.CheckerStarted(self.current_checker_command)
830
self.PropertyChanged(
831
dbus.String(u"CheckerRunning"),
832
dbus.Boolean(True, variant_level=1))
835
def stop_checker(self, *args, **kwargs):
836
old_checker = getattr(self, u"checker", None)
837
r = Client.stop_checker(self, *args, **kwargs)
838
if (old_checker is not None
839
and getattr(self, u"checker", None) is None):
840
self.PropertyChanged(dbus.String(u"CheckerRunning"),
841
dbus.Boolean(False, variant_level=1))
844
885
def _reset_approved(self):
845
886
self._approved = None
848
889
def approve(self, value=True):
849
890
self.send_changedstate()
850
891
self._approved = value
851
gobject.timeout_add(self._timedelta_to_milliseconds
892
gobject.timeout_add(_timedelta_to_milliseconds
852
893
(self.approval_duration),
853
894
self._reset_approved)
856
897
## D-Bus methods, signals & properties
857
_interface = u"se.bsnet.fukt.Mandos.Client"
898
_interface = "se.bsnet.fukt.Mandos.Client"
861
902
# CheckerCompleted - signal
862
@dbus.service.signal(_interface, signature=u"nxs")
903
@dbus.service.signal(_interface, signature="nxs")
863
904
def CheckerCompleted(self, exitcode, waitstatus, command):
867
908
# CheckerStarted - signal
868
@dbus.service.signal(_interface, signature=u"s")
909
@dbus.service.signal(_interface, signature="s")
869
910
def CheckerStarted(self, command):
873
914
# PropertyChanged - signal
874
@dbus.service.signal(_interface, signature=u"sv")
915
@dbus.service.signal(_interface, signature="sv")
875
916
def PropertyChanged(self, property, value):
937
978
# ApprovalPending - property
938
@dbus_service_property(_interface, signature=u"b", access=u"read")
979
@dbus_service_property(_interface, signature="b", access="read")
939
980
def ApprovalPending_dbus_property(self):
940
981
return dbus.Boolean(bool(self.approvals_pending))
942
983
# ApprovedByDefault - property
943
@dbus_service_property(_interface, signature=u"b",
984
@dbus_service_property(_interface, signature="b",
945
986
def ApprovedByDefault_dbus_property(self, value=None):
946
987
if value is None: # get
947
988
return dbus.Boolean(self.approved_by_default)
948
989
self.approved_by_default = bool(value)
950
self.PropertyChanged(dbus.String(u"ApprovedByDefault"),
951
dbus.Boolean(value, variant_level=1))
953
991
# ApprovalDelay - property
954
@dbus_service_property(_interface, signature=u"t",
992
@dbus_service_property(_interface, signature="t",
956
994
def ApprovalDelay_dbus_property(self, value=None):
957
995
if value is None: # get
958
996
return dbus.UInt64(self.approval_delay_milliseconds())
959
997
self.approval_delay = datetime.timedelta(0, 0, 0, value)
961
self.PropertyChanged(dbus.String(u"ApprovalDelay"),
962
dbus.UInt64(value, variant_level=1))
964
999
# ApprovalDuration - property
965
@dbus_service_property(_interface, signature=u"t",
1000
@dbus_service_property(_interface, signature="t",
967
1002
def ApprovalDuration_dbus_property(self, value=None):
968
1003
if value is None: # get
969
return dbus.UInt64(self._timedelta_to_milliseconds(
1004
return dbus.UInt64(_timedelta_to_milliseconds(
970
1005
self.approval_duration))
971
1006
self.approval_duration = datetime.timedelta(0, 0, 0, value)
973
self.PropertyChanged(dbus.String(u"ApprovalDuration"),
974
dbus.UInt64(value, variant_level=1))
976
1008
# Name - property
977
@dbus_service_property(_interface, signature=u"s", access=u"read")
1009
@dbus_service_property(_interface, signature="s", access="read")
978
1010
def Name_dbus_property(self):
979
1011
return dbus.String(self.name)
981
1013
# Fingerprint - property
982
@dbus_service_property(_interface, signature=u"s", access=u"read")
1014
@dbus_service_property(_interface, signature="s", access="read")
983
1015
def Fingerprint_dbus_property(self):
984
1016
return dbus.String(self.fingerprint)
986
1018
# Host - property
987
@dbus_service_property(_interface, signature=u"s",
1019
@dbus_service_property(_interface, signature="s",
989
1021
def Host_dbus_property(self, value=None):
990
1022
if value is None: # get
991
1023
return dbus.String(self.host)
992
1024
self.host = value
994
self.PropertyChanged(dbus.String(u"Host"),
995
dbus.String(value, variant_level=1))
997
1026
# Created - property
998
@dbus_service_property(_interface, signature=u"s", access=u"read")
1027
@dbus_service_property(_interface, signature="s", access="read")
999
1028
def Created_dbus_property(self):
1000
return dbus.String(self._datetime_to_dbus(self.created))
1029
return dbus.String(datetime_to_dbus(self.created))
1002
1031
# LastEnabled - property
1003
@dbus_service_property(_interface, signature=u"s", access=u"read")
1032
@dbus_service_property(_interface, signature="s", access="read")
1004
1033
def LastEnabled_dbus_property(self):
1005
if self.last_enabled is None:
1006
return dbus.String(u"")
1007
return dbus.String(self._datetime_to_dbus(self.last_enabled))
1034
return datetime_to_dbus(self.last_enabled)
1009
1036
# Enabled - property
1010
@dbus_service_property(_interface, signature=u"b",
1011
access=u"readwrite")
1037
@dbus_service_property(_interface, signature="b",
1012
1039
def Enabled_dbus_property(self, value=None):
1013
1040
if value is None: # get
1014
1041
return dbus.Boolean(self.enabled)
1020
1047
# LastCheckedOK - property
1021
@dbus_service_property(_interface, signature=u"s",
1022
access=u"readwrite")
1048
@dbus_service_property(_interface, signature="s",
1023
1050
def LastCheckedOK_dbus_property(self, value=None):
1024
1051
if value is not None:
1025
1052
self.checked_ok()
1027
if self.last_checked_ok is None:
1028
return dbus.String(u"")
1029
return dbus.String(self._datetime_to_dbus(self
1054
return datetime_to_dbus(self.last_checked_ok)
1056
# Expires - property
1057
@dbus_service_property(_interface, signature="s", access="read")
1058
def Expires_dbus_property(self):
1059
return datetime_to_dbus(self.expires)
1061
# LastApprovalRequest - property
1062
@dbus_service_property(_interface, signature="s", access="read")
1063
def LastApprovalRequest_dbus_property(self):
1064
return datetime_to_dbus(self.last_approval_request)
1032
1066
# Timeout - property
1033
@dbus_service_property(_interface, signature=u"t",
1034
access=u"readwrite")
1067
@dbus_service_property(_interface, signature="t",
1035
1069
def Timeout_dbus_property(self, value=None):
1036
1070
if value is None: # get
1037
1071
return dbus.UInt64(self.timeout_milliseconds())
1038
1072
self.timeout = datetime.timedelta(0, 0, 0, value)
1040
self.PropertyChanged(dbus.String(u"Timeout"),
1041
dbus.UInt64(value, variant_level=1))
1042
if getattr(self, u"disable_initiator_tag", None) is None:
1073
if getattr(self, "disable_initiator_tag", None) is None:
1044
1075
# Reschedule timeout
1045
1076
gobject.source_remove(self.disable_initiator_tag)
1046
1077
self.disable_initiator_tag = None
1047
1079
time_to_die = (self.
1048
1080
_timedelta_to_milliseconds((self
1049
1081
.last_checked_ok
1054
1086
# The timeout has passed
1089
self.expires = (datetime.datetime.utcnow()
1090
+ datetime.timedelta(milliseconds = time_to_die))
1057
1091
self.disable_initiator_tag = (gobject.timeout_add
1058
1092
(time_to_die, self.disable))
1094
# ExtendedTimeout - property
1095
@dbus_service_property(_interface, signature="t",
1097
def ExtendedTimeout_dbus_property(self, value=None):
1098
if value is None: # get
1099
return dbus.UInt64(self.extended_timeout_milliseconds())
1100
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1060
1102
# Interval - property
1061
@dbus_service_property(_interface, signature=u"t",
1062
access=u"readwrite")
1103
@dbus_service_property(_interface, signature="t",
1063
1105
def Interval_dbus_property(self, value=None):
1064
1106
if value is None: # get
1065
1107
return dbus.UInt64(self.interval_milliseconds())
1066
1108
self.interval = datetime.timedelta(0, 0, 0, value)
1068
self.PropertyChanged(dbus.String(u"Interval"),
1069
dbus.UInt64(value, variant_level=1))
1070
if getattr(self, u"checker_initiator_tag", None) is None:
1109
if getattr(self, "checker_initiator_tag", None) is None:
1072
1111
# Reschedule checker run
1073
1112
gobject.source_remove(self.checker_initiator_tag)
1076
1115
self.start_checker() # Start one now, too
1078
1117
# Checker - property
1079
@dbus_service_property(_interface, signature=u"s",
1080
access=u"readwrite")
1118
@dbus_service_property(_interface, signature="s",
1081
1120
def Checker_dbus_property(self, value=None):
1082
1121
if value is None: # get
1083
1122
return dbus.String(self.checker_command)
1084
1123
self.checker_command = value
1086
self.PropertyChanged(dbus.String(u"Checker"),
1087
dbus.String(self.checker_command,
1090
1125
# CheckerRunning - property
1091
@dbus_service_property(_interface, signature=u"b",
1092
access=u"readwrite")
1126
@dbus_service_property(_interface, signature="b",
1093
1128
def CheckerRunning_dbus_property(self, value=None):
1094
1129
if value is None: # get
1095
1130
return dbus.Boolean(self.checker is not None)
1161
1196
# no X.509 keys are added to it. Therefore, we can use it
1162
1197
# here despite using OpenPGP certificates.
1164
#priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
1165
# u"+AES-256-CBC", u"+SHA1",
1166
# u"+COMP-NULL", u"+CTYPE-OPENPGP",
1199
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1200
# "+AES-256-CBC", "+SHA1",
1201
# "+COMP-NULL", "+CTYPE-OPENPGP",
1168
1203
# Use a fallback default, since this MUST be set.
1169
1204
priority = self.server.gnutls_priority
1170
1205
if priority is None:
1171
priority = u"NORMAL"
1172
1207
(gnutls.library.functions
1173
1208
.gnutls_priority_set_direct(session._c_object,
1174
1209
priority, None))
1176
1211
# Start communication using the Mandos protocol
1177
1212
# Get protocol number
1178
1213
line = self.request.makefile().readline()
1179
logger.debug(u"Protocol version: %r", line)
1214
logger.debug("Protocol version: %r", line)
1181
1216
if int(line.strip().split()[0]) > 1:
1182
1217
raise RuntimeError
1183
except (ValueError, IndexError, RuntimeError), error:
1184
logger.error(u"Unknown protocol version: %s", error)
1218
except (ValueError, IndexError, RuntimeError) as error:
1219
logger.error("Unknown protocol version: %s", error)
1187
1222
# Start GnuTLS connection
1189
1224
session.handshake()
1190
except gnutls.errors.GNUTLSError, error:
1191
logger.warning(u"Handshake failed: %s", error)
1225
except gnutls.errors.GNUTLSError as error:
1226
logger.warning("Handshake failed: %s", error)
1192
1227
# Do not run session.bye() here: the session is not
1193
1228
# established. Just abandon the request.
1195
logger.debug(u"Handshake succeeded")
1230
logger.debug("Handshake succeeded")
1197
1232
approval_required = False
1200
1235
fpr = self.fingerprint(self.peer_certificate
1202
except (TypeError, gnutls.errors.GNUTLSError), error:
1203
logger.warning(u"Bad certificate: %s", error)
1238
gnutls.errors.GNUTLSError) as error:
1239
logger.warning("Bad certificate: %s", error)
1205
logger.debug(u"Fingerprint: %s", fpr)
1241
logger.debug("Fingerprint: %s", fpr)
1208
1244
client = ProxyClient(child_pipe, fpr,
1409
1445
bind to an address or port if they were not specified."""
1410
1446
if self.interface is not None:
1411
1447
if SO_BINDTODEVICE is None:
1412
logger.error(u"SO_BINDTODEVICE does not exist;"
1413
u" cannot bind to interface %s",
1448
logger.error("SO_BINDTODEVICE does not exist;"
1449
" cannot bind to interface %s",
1414
1450
self.interface)
1417
1453
self.socket.setsockopt(socket.SOL_SOCKET,
1418
1454
SO_BINDTODEVICE,
1419
1455
str(self.interface
1421
except socket.error, error:
1457
except socket.error as error:
1422
1458
if error[0] == errno.EPERM:
1423
logger.error(u"No permission to"
1424
u" bind to interface %s",
1459
logger.error("No permission to"
1460
" bind to interface %s",
1425
1461
self.interface)
1426
1462
elif error[0] == errno.ENOPROTOOPT:
1427
logger.error(u"SO_BINDTODEVICE not available;"
1428
u" cannot bind to interface %s",
1463
logger.error("SO_BINDTODEVICE not available;"
1464
" cannot bind to interface %s",
1429
1465
self.interface)
1488
1524
def handle_ipc(self, source, condition, parent_pipe=None,
1489
1525
client_object=None):
1490
1526
condition_names = {
1491
gobject.IO_IN: u"IN", # There is data to read.
1492
gobject.IO_OUT: u"OUT", # Data can be written (without
1527
gobject.IO_IN: "IN", # There is data to read.
1528
gobject.IO_OUT: "OUT", # Data can be written (without
1494
gobject.IO_PRI: u"PRI", # There is urgent data to read.
1495
gobject.IO_ERR: u"ERR", # Error condition.
1496
gobject.IO_HUP: u"HUP" # Hung up (the connection has been
1530
gobject.IO_PRI: "PRI", # There is urgent data to read.
1531
gobject.IO_ERR: "ERR", # Error condition.
1532
gobject.IO_HUP: "HUP" # Hung up (the connection has been
1497
1533
# broken, usually for pipes and
1559
1595
def string_to_delta(interval):
1560
1596
"""Parse a string and return a datetime.timedelta
1562
>>> string_to_delta(u'7d')
1598
>>> string_to_delta('7d')
1563
1599
datetime.timedelta(7)
1564
>>> string_to_delta(u'60s')
1600
>>> string_to_delta('60s')
1565
1601
datetime.timedelta(0, 60)
1566
>>> string_to_delta(u'60m')
1602
>>> string_to_delta('60m')
1567
1603
datetime.timedelta(0, 3600)
1568
>>> string_to_delta(u'24h')
1604
>>> string_to_delta('24h')
1569
1605
datetime.timedelta(1)
1570
>>> string_to_delta(u'1w')
1606
>>> string_to_delta('1w')
1571
1607
datetime.timedelta(7)
1572
>>> string_to_delta(u'5m 30s')
1608
>>> string_to_delta('5m 30s')
1573
1609
datetime.timedelta(0, 330)
1575
1611
timevalue = datetime.timedelta(0)
1578
1614
suffix = unicode(s[-1])
1579
1615
value = int(s[:-1])
1581
1617
delta = datetime.timedelta(value)
1582
elif suffix == u"s":
1583
1619
delta = datetime.timedelta(0, value)
1584
elif suffix == u"m":
1585
1621
delta = datetime.timedelta(0, 0, 0, 0, value)
1586
elif suffix == u"h":
1587
1623
delta = datetime.timedelta(0, 0, 0, 0, 0, value)
1588
elif suffix == u"w":
1589
1625
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1591
raise ValueError(u"Unknown suffix %r" % suffix)
1592
except (ValueError, IndexError), e:
1593
raise ValueError(e.message)
1627
raise ValueError("Unknown suffix %r" % suffix)
1628
except (ValueError, IndexError) as e:
1629
raise ValueError(*(e.args))
1594
1630
timevalue += delta
1595
1631
return timevalue
1602
1638
global if_nametoindex
1604
1640
if_nametoindex = (ctypes.cdll.LoadLibrary
1605
(ctypes.util.find_library(u"c"))
1641
(ctypes.util.find_library("c"))
1606
1642
.if_nametoindex)
1607
1643
except (OSError, AttributeError):
1608
logger.warning(u"Doing if_nametoindex the hard way")
1644
logger.warning("Doing if_nametoindex the hard way")
1609
1645
def if_nametoindex(interface):
1610
1646
"Get an interface index the hard way, i.e. using fcntl()"
1611
1647
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
1612
1648
with contextlib.closing(socket.socket()) as s:
1613
1649
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1614
struct.pack(str(u"16s16x"),
1650
struct.pack(str("16s16x"),
1616
interface_index = struct.unpack(str(u"I"),
1652
interface_index = struct.unpack(str("I"),
1617
1653
ifreq[16:20])[0]
1618
1654
return interface_index
1619
1655
return if_nametoindex(interface)
1649
1685
##################################################################
1650
1686
# Parsing of options, both command line and config file
1652
parser = optparse.OptionParser(version = "%%prog %s" % version)
1653
parser.add_option("-i", u"--interface", type=u"string",
1654
metavar="IF", help=u"Bind to interface IF")
1655
parser.add_option("-a", u"--address", type=u"string",
1656
help=u"Address to listen for requests on")
1657
parser.add_option("-p", u"--port", type=u"int",
1658
help=u"Port number to receive requests on")
1659
parser.add_option("--check", action=u"store_true",
1660
help=u"Run self-test")
1661
parser.add_option("--debug", action=u"store_true",
1662
help=u"Debug mode; run in foreground and log to"
1664
parser.add_option("--debuglevel", type=u"string", metavar="Level",
1665
help=u"Debug level for stdout output")
1666
parser.add_option("--priority", type=u"string", help=u"GnuTLS"
1667
u" priority string (see GnuTLS documentation)")
1668
parser.add_option("--servicename", type=u"string",
1669
metavar=u"NAME", help=u"Zeroconf service name")
1670
parser.add_option("--configdir", type=u"string",
1671
default=u"/etc/mandos", metavar=u"DIR",
1672
help=u"Directory to search for configuration"
1674
parser.add_option("--no-dbus", action=u"store_false",
1675
dest=u"use_dbus", help=u"Do not provide D-Bus"
1676
u" system bus interface")
1677
parser.add_option("--no-ipv6", action=u"store_false",
1678
dest=u"use_ipv6", help=u"Do not use IPv6")
1679
options = parser.parse_args()[0]
1688
parser = argparse.ArgumentParser()
1689
parser.add_argument("-v", "--version", action="version",
1690
version = "%%(prog)s %s" % version,
1691
help="show version number and exit")
1692
parser.add_argument("-i", "--interface", metavar="IF",
1693
help="Bind to interface IF")
1694
parser.add_argument("-a", "--address",
1695
help="Address to listen for requests on")
1696
parser.add_argument("-p", "--port", type=int,
1697
help="Port number to receive requests on")
1698
parser.add_argument("--check", action="store_true",
1699
help="Run self-test")
1700
parser.add_argument("--debug", action="store_true",
1701
help="Debug mode; run in foreground and log"
1703
parser.add_argument("--debuglevel", metavar="LEVEL",
1704
help="Debug level for stdout output")
1705
parser.add_argument("--priority", help="GnuTLS"
1706
" priority string (see GnuTLS documentation)")
1707
parser.add_argument("--servicename",
1708
metavar="NAME", help="Zeroconf service name")
1709
parser.add_argument("--configdir",
1710
default="/etc/mandos", metavar="DIR",
1711
help="Directory to search for configuration"
1713
parser.add_argument("--no-dbus", action="store_false",
1714
dest="use_dbus", help="Do not provide D-Bus"
1715
" system bus interface")
1716
parser.add_argument("--no-ipv6", action="store_false",
1717
dest="use_ipv6", help="Do not use IPv6")
1718
options = parser.parse_args()
1681
1720
if options.check:
1686
1725
# Default values for config file for server-global settings
1687
server_defaults = { u"interface": u"",
1692
u"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1693
u"servicename": u"Mandos",
1694
u"use_dbus": u"True",
1695
u"use_ipv6": u"True",
1726
server_defaults = { "interface": "",
1731
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1732
"servicename": "Mandos",
1699
1738
# Parse config file for server-global settings
1700
1739
server_config = configparser.SafeConfigParser(server_defaults)
1701
1740
del server_defaults
1702
1741
server_config.read(os.path.join(options.configdir,
1704
1743
# Convert the SafeConfigParser object to a dict
1705
1744
server_settings = server_config.defaults()
1706
1745
# Use the appropriate methods on the non-string config options
1707
for option in (u"debug", u"use_dbus", u"use_ipv6"):
1708
server_settings[option] = server_config.getboolean(u"DEFAULT",
1746
for option in ("debug", "use_dbus", "use_ipv6"):
1747
server_settings[option] = server_config.getboolean("DEFAULT",
1710
1749
if server_settings["port"]:
1711
server_settings["port"] = server_config.getint(u"DEFAULT",
1750
server_settings["port"] = server_config.getint("DEFAULT",
1713
1752
del server_config
1715
1754
# Override the settings from the config file with command line
1716
1755
# options, if set.
1717
for option in (u"interface", u"address", u"port", u"debug",
1718
u"priority", u"servicename", u"configdir",
1719
u"use_dbus", u"use_ipv6", u"debuglevel"):
1756
for option in ("interface", "address", "port", "debug",
1757
"priority", "servicename", "configdir",
1758
"use_dbus", "use_ipv6", "debuglevel"):
1720
1759
value = getattr(options, option)
1721
1760
if value is not None:
1722
1761
server_settings[option] = value
1730
1769
##################################################################
1732
1771
# For convenience
1733
debug = server_settings[u"debug"]
1734
debuglevel = server_settings[u"debuglevel"]
1735
use_dbus = server_settings[u"use_dbus"]
1736
use_ipv6 = server_settings[u"use_ipv6"]
1772
debug = server_settings["debug"]
1773
debuglevel = server_settings["debuglevel"]
1774
use_dbus = server_settings["use_dbus"]
1775
use_ipv6 = server_settings["use_ipv6"]
1738
if server_settings[u"servicename"] != u"Mandos":
1777
if server_settings["servicename"] != "Mandos":
1739
1778
syslogger.setFormatter(logging.Formatter
1740
(u'Mandos (%s) [%%(process)d]:'
1741
u' %%(levelname)s: %%(message)s'
1742
% server_settings[u"servicename"]))
1779
('Mandos (%s) [%%(process)d]:'
1780
' %%(levelname)s: %%(message)s'
1781
% server_settings["servicename"]))
1744
1783
# Parse config file with clients
1745
client_defaults = { u"timeout": u"1h",
1747
u"checker": u"fping -q -- %%(host)s",
1749
u"approval_delay": u"0s",
1750
u"approval_duration": u"1s",
1784
client_defaults = { "timeout": "5m",
1785
"extended_timeout": "15m",
1787
"checker": "fping -q -- %%(host)s",
1789
"approval_delay": "0s",
1790
"approval_duration": "1s",
1752
1792
client_config = configparser.SafeConfigParser(client_defaults)
1753
client_config.read(os.path.join(server_settings[u"configdir"],
1793
client_config.read(os.path.join(server_settings["configdir"],
1756
1796
global mandos_dbus_service
1757
1797
mandos_dbus_service = None
1759
tcp_server = MandosServer((server_settings[u"address"],
1760
server_settings[u"port"]),
1799
tcp_server = MandosServer((server_settings["address"],
1800
server_settings["port"]),
1762
interface=(server_settings[u"interface"]
1802
interface=(server_settings["interface"]
1764
1804
use_ipv6=use_ipv6,
1765
1805
gnutls_priority=
1766
server_settings[u"priority"],
1806
server_settings["priority"],
1767
1807
use_dbus=use_dbus)
1769
pidfilename = u"/var/run/mandos.pid"
1809
pidfilename = "/var/run/mandos.pid"
1771
pidfile = open(pidfilename, u"w")
1811
pidfile = open(pidfilename, "w")
1772
1812
except IOError:
1773
logger.error(u"Could not open file %r", pidfilename)
1813
logger.error("Could not open file %r", pidfilename)
1776
uid = pwd.getpwnam(u"_mandos").pw_uid
1777
gid = pwd.getpwnam(u"_mandos").pw_gid
1816
uid = pwd.getpwnam("_mandos").pw_uid
1817
gid = pwd.getpwnam("_mandos").pw_gid
1778
1818
except KeyError:
1780
uid = pwd.getpwnam(u"mandos").pw_uid
1781
gid = pwd.getpwnam(u"mandos").pw_gid
1820
uid = pwd.getpwnam("mandos").pw_uid
1821
gid = pwd.getpwnam("mandos").pw_gid
1782
1822
except KeyError:
1784
uid = pwd.getpwnam(u"nobody").pw_uid
1785
gid = pwd.getpwnam(u"nobody").pw_gid
1824
uid = pwd.getpwnam("nobody").pw_uid
1825
gid = pwd.getpwnam("nobody").pw_gid
1786
1826
except KeyError:
1792
except OSError, error:
1832
except OSError as error:
1793
1833
if error[0] != errno.EPERM:
1833
1877
# End of Avahi example code
1836
bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos",
1880
bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
1837
1881
bus, do_not_queue=True)
1838
except dbus.exceptions.NameExistsException, e:
1839
logger.error(unicode(e) + u", disabling D-Bus")
1882
except dbus.exceptions.NameExistsException as e:
1883
logger.error(unicode(e) + ", disabling D-Bus")
1840
1884
use_dbus = False
1841
server_settings[u"use_dbus"] = False
1885
server_settings["use_dbus"] = False
1842
1886
tcp_server.use_dbus = False
1843
1887
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1844
service = AvahiService(name = server_settings[u"servicename"],
1845
servicetype = u"_mandos._tcp",
1888
service = AvahiService(name = server_settings["servicename"],
1889
servicetype = "_mandos._tcp",
1846
1890
protocol = protocol, bus = bus)
1847
1891
if server_settings["interface"]:
1848
1892
service.interface = (if_nametoindex
1849
(str(server_settings[u"interface"])))
1852
# Close all input and output, do double fork, etc.
1893
(str(server_settings["interface"])))
1855
1895
global multiprocessing_manager
1856
1896
multiprocessing_manager = multiprocessing.Manager()
1901
1941
class MandosDBusService(dbus.service.Object):
1902
1942
"""A D-Bus proxy object"""
1903
1943
def __init__(self):
1904
dbus.service.Object.__init__(self, bus, u"/")
1905
_interface = u"se.bsnet.fukt.Mandos"
1944
dbus.service.Object.__init__(self, bus, "/")
1945
_interface = "se.bsnet.fukt.Mandos"
1907
@dbus.service.signal(_interface, signature=u"o")
1947
@dbus.service.signal(_interface, signature="o")
1908
1948
def ClientAdded(self, objpath):
1912
@dbus.service.signal(_interface, signature=u"ss")
1952
@dbus.service.signal(_interface, signature="ss")
1913
1953
def ClientNotFound(self, fingerprint, address):
1917
@dbus.service.signal(_interface, signature=u"os")
1957
@dbus.service.signal(_interface, signature="os")
1918
1958
def ClientRemoved(self, objpath, name):
1922
@dbus.service.method(_interface, out_signature=u"ao")
1962
@dbus.service.method(_interface, out_signature="ao")
1923
1963
def GetAllClients(self):
1925
1965
return dbus.Array(c.dbus_object_path
1926
1966
for c in tcp_server.clients)
1928
1968
@dbus.service.method(_interface,
1929
out_signature=u"a{oa{sv}}")
1969
out_signature="a{oa{sv}}")
1930
1970
def GetAllClientsWithProperties(self):
1932
1972
return dbus.Dictionary(
1933
((c.dbus_object_path, c.GetAll(u""))
1973
((c.dbus_object_path, c.GetAll(""))
1934
1974
for c in tcp_server.clients),
1935
signature=u"oa{sv}")
1937
@dbus.service.method(_interface, in_signature=u"o")
1977
@dbus.service.method(_interface, in_signature="o")
1938
1978
def RemoveClient(self, object_path):
1940
1980
for c in tcp_server.clients:
2006
2046
(tcp_server.handle_request
2007
2047
(*args[2:], **kwargs) or True))
2009
logger.debug(u"Starting main loop")
2049
logger.debug("Starting main loop")
2010
2050
main_loop.run()
2011
except AvahiError, error:
2012
logger.critical(u"AvahiError: %s", error)
2051
except AvahiError as error:
2052
logger.critical("AvahiError: %s", error)
2015
2055
except KeyboardInterrupt:
2018
logger.debug(u"Server received KeyboardInterrupt")
2019
logger.debug(u"Server exiting")
2057
print("", file=sys.stderr)
2058
logger.debug("Server received KeyboardInterrupt")
2059
logger.debug("Server exiting")
2020
2060
# Must run before the D-Bus bus name gets deregistered