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