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.info(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
269
secret: bytestring; sent verbatim (over TLS) to client
304
270
timeout: datetime.timedelta(); How long from last_checked_ok
305
271
until this client is disabled
306
extended_timeout: extra long timeout when password has been sent
307
272
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")
275
runtime_expansions = (u"approval_delay", u"approval_duration",
276
u"created", u"enabled", u"fingerprint",
277
u"host", u"interval", u"last_checked_ok",
278
u"last_enabled", u"name", u"timeout")
281
def _timedelta_to_milliseconds(td):
282
"Convert a datetime.timedelta() to milliseconds"
283
return ((td.days * 24 * 60 * 60 * 1000)
284
+ (td.seconds * 1000)
285
+ (td.microseconds // 1000))
317
287
def timeout_milliseconds(self):
318
288
"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)
289
return self._timedelta_to_milliseconds(self.timeout)
325
291
def interval_milliseconds(self):
326
292
"Return the 'interval' attribute in milliseconds"
327
return _timedelta_to_milliseconds(self.interval)
293
return self._timedelta_to_milliseconds(self.interval)
329
295
def approval_delay_milliseconds(self):
330
return _timedelta_to_milliseconds(self.approval_delay)
296
return self._timedelta_to_milliseconds(self.approval_delay)
332
298
def __init__(self, name = None, disable_hook=None, config=None):
333
299
"""Note: the 'checker' key in 'config' sets the
337
303
if config is None:
339
logger.debug("Creating client %r", self.name)
305
logger.debug(u"Creating client %r", self.name)
340
306
# Uppercase and remove spaces from fingerprint for later
341
307
# 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:
309
self.fingerprint = (config[u"fingerprint"].upper()
311
logger.debug(u" Fingerprint: %s", self.fingerprint)
312
if u"secret" in config:
313
self.secret = config[u"secret"].decode(u"base64")
314
elif u"secfile" in config:
349
315
with open(os.path.expanduser(os.path.expandvars
350
(config["secfile"])),
316
(config[u"secfile"])),
351
317
"rb") as secfile:
352
318
self.secret = secfile.read()
354
raise TypeError("No secret or secfile for client %s"
320
raise TypeError(u"No secret or secfile for client %s"
356
self.host = config.get("host", "")
322
self.host = config.get(u"host", u"")
357
323
self.created = datetime.datetime.utcnow()
358
324
self.enabled = False
359
325
self.last_approval_request = None
360
326
self.last_enabled = None
361
327
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"])
328
self.timeout = string_to_delta(config[u"timeout"])
329
self.interval = string_to_delta(config[u"interval"])
365
330
self.disable_hook = disable_hook
366
331
self.checker = None
367
332
self.checker_initiator_tag = None
368
333
self.disable_initiator_tag = None
370
334
self.checker_callback_tag = None
371
self.checker_command = config["checker"]
335
self.checker_command = config[u"checker"]
372
336
self.current_checker_command = None
373
337
self.last_connect = None
374
338
self._approved = None
375
self.approved_by_default = config.get("approved_by_default",
339
self.approved_by_default = config.get(u"approved_by_default",
377
341
self.approvals_pending = 0
378
342
self.approval_delay = string_to_delta(
379
config["approval_delay"])
343
config[u"approval_delay"])
380
344
self.approval_duration = string_to_delta(
381
config["approval_duration"])
345
config[u"approval_duration"])
382
346
self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
384
348
def send_changedstate(self):
389
353
def enable(self):
390
354
"""Start this client's checker and timeout hooks"""
391
if getattr(self, "enabled", False):
355
if getattr(self, u"enabled", False):
392
356
# Already enabled
394
358
self.send_changedstate()
359
self.last_enabled = datetime.datetime.utcnow()
395
360
# Schedule a new checker to be started an 'interval' from now,
396
361
# and every interval from then on.
397
362
self.checker_initiator_tag = (gobject.timeout_add
398
363
(self.interval_milliseconds(),
399
364
self.start_checker))
400
365
# Schedule a disable() when 'timeout' has passed
401
self.expires = datetime.datetime.utcnow() + self.timeout
402
366
self.disable_initiator_tag = (gobject.timeout_add
403
367
(self.timeout_milliseconds(),
405
369
self.enabled = True
406
self.last_enabled = datetime.datetime.utcnow()
407
370
# Also start a new checker *right now*.
408
371
self.start_checker()
440
402
if os.WIFEXITED(condition):
441
403
exitstatus = os.WEXITSTATUS(condition)
442
404
if exitstatus == 0:
443
logger.info("Checker for %(name)s succeeded",
405
logger.info(u"Checker for %(name)s succeeded",
445
407
self.checked_ok()
447
logger.info("Checker for %(name)s failed",
409
logger.info(u"Checker for %(name)s failed",
450
logger.warning("Checker for %(name)s crashed?",
412
logger.warning(u"Checker for %(name)s crashed?",
453
def checked_ok(self, timeout=None):
415
def checked_ok(self):
454
416
"""Bump up the timeout for this client.
456
418
This should only be called when the client has been seen,
460
timeout = self.timeout
461
421
self.last_checked_ok = datetime.datetime.utcnow()
462
422
gobject.source_remove(self.disable_initiator_tag)
463
self.expires = datetime.datetime.utcnow() + timeout
464
423
self.disable_initiator_tag = (gobject.timeout_add
465
(_timedelta_to_milliseconds(timeout),
424
(self.timeout_milliseconds(),
468
427
def need_approval(self):
504
463
# Escape attributes for the shell
505
464
escaped_attrs = dict(
507
re.escape(unicode(str(getattr(self, attr, "")),
466
re.escape(unicode(str(getattr(self, attr, u"")),
511
470
self.runtime_expansions)
514
473
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)
474
except TypeError, error:
475
logger.error(u'Could not format string "%s":'
476
u' %s', self.checker_command, error)
518
477
return True # Try again later
519
478
self.current_checker_command = command
521
logger.info("Starting checker %r for %s",
480
logger.info(u"Starting checker %r for %s",
522
481
command, self.name)
523
482
# We don't need to redirect stdout and stderr, since
524
483
# in normal mode, that is already done by daemon(),
548
507
if self.checker_callback_tag:
549
508
gobject.source_remove(self.checker_callback_tag)
550
509
self.checker_callback_tag = None
551
if getattr(self, "checker", None) is None:
510
if getattr(self, u"checker", None) is None:
553
logger.debug("Stopping checker for %(name)s", vars(self))
512
logger.debug(u"Stopping checker for %(name)s", vars(self))
555
514
os.kill(self.checker.pid, signal.SIGTERM)
557
516
#if self.checker.poll() is None:
558
517
# os.kill(self.checker.pid, signal.SIGKILL)
559
except OSError as error:
518
except OSError, error:
560
519
if error.errno != errno.ESRCH: # No such process
562
521
self.checker = None
564
def dbus_service_property(dbus_interface, signature="v",
565
access="readwrite", byte_arrays=False):
523
def dbus_service_property(dbus_interface, signature=u"v",
524
access=u"readwrite", byte_arrays=False):
566
525
"""Decorators for marking methods of a DBusObjectWithProperties to
567
526
become properties on the D-Bus.
576
535
# Encoding deeply encoded byte arrays is not supported yet by the
577
536
# "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)
537
if byte_arrays and signature != u"ay":
538
raise ValueError(u"Byte arrays not supported for non-'ay'"
539
u" signature %r" % signature)
581
540
def decorator(func):
582
541
func._dbus_is_property = True
583
542
func._dbus_interface = dbus_interface
584
543
func._dbus_signature = signature
585
544
func._dbus_access = access
586
545
func._dbus_name = func.__name__
587
if func._dbus_name.endswith("_dbus_property"):
546
if func._dbus_name.endswith(u"_dbus_property"):
588
547
func._dbus_name = func._dbus_name[:-14]
589
func._dbus_get_args_options = {'byte_arrays': byte_arrays }
548
func._dbus_get_args_options = {u'byte_arrays': byte_arrays }
646
605
# No such property
647
raise DBusPropertyNotFound(self.dbus_object_path + ":"
648
+ interface_name + "."
606
raise DBusPropertyNotFound(self.dbus_object_path + u":"
607
+ interface_name + u"."
651
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
610
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ss",
653
612
def Get(self, interface_name, property_name):
654
613
"""Standard D-Bus property Get() method, see D-Bus standard.
656
615
prop = self._get_dbus_property(interface_name, property_name)
657
if prop._dbus_access == "write":
616
if prop._dbus_access == u"write":
658
617
raise DBusPropertyAccessException(property_name)
660
if not hasattr(value, "variant_level"):
619
if not hasattr(value, u"variant_level"):
662
621
return type(value)(value, variant_level=value.variant_level+1)
664
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
623
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ssv")
665
624
def Set(self, interface_name, property_name, value):
666
625
"""Standard D-Bus property Set() method, see D-Bus standard.
668
627
prop = self._get_dbus_property(interface_name, property_name)
669
if prop._dbus_access == "read":
628
if prop._dbus_access == u"read":
670
629
raise DBusPropertyAccessException(property_name)
671
if prop._dbus_get_args_options["byte_arrays"]:
630
if prop._dbus_get_args_options[u"byte_arrays"]:
672
631
# The byte_arrays option is not supported yet on
673
632
# signatures other than "ay".
674
if prop._dbus_signature != "ay":
633
if prop._dbus_signature != u"ay":
676
635
value = dbus.ByteArray(''.join(unichr(byte)
677
636
for byte in value))
680
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
681
out_signature="a{sv}")
639
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"s",
640
out_signature=u"a{sv}")
682
641
def GetAll(self, interface_name):
683
642
"""Standard D-Bus property GetAll() method, see D-Bus
692
651
# Interface non-empty but did not match
694
653
# Ignore write-only properties
695
if prop._dbus_access == "write":
654
if prop._dbus_access == u"write":
698
if not hasattr(value, "variant_level"):
657
if not hasattr(value, u"variant_level"):
699
658
all[name] = value
701
660
all[name] = type(value)(value, variant_level=
702
661
value.variant_level+1)
703
return dbus.Dictionary(all, signature="sv")
662
return dbus.Dictionary(all, signature=u"sv")
705
664
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
707
666
path_keyword='object_path',
708
667
connection_keyword='connection')
709
668
def Introspect(self, object_path, connection):
715
674
document = xml.dom.minidom.parseString(xmlstring)
716
675
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)
676
e = document.createElement(u"property")
677
e.setAttribute(u"name", name)
678
e.setAttribute(u"type", prop._dbus_signature)
679
e.setAttribute(u"access", prop._dbus_access)
722
for if_tag in document.getElementsByTagName("interface"):
681
for if_tag in document.getElementsByTagName(u"interface"):
723
682
for tag in (make_tag(document, name, prop)
725
684
in self._get_all_dbus_properties()
726
685
if prop._dbus_interface
727
== if_tag.getAttribute("name")):
686
== if_tag.getAttribute(u"name")):
728
687
if_tag.appendChild(tag)
729
688
# Add the names to the return values for the
730
689
# "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")
690
if (if_tag.getAttribute(u"name")
691
== u"org.freedesktop.DBus.Properties"):
692
for cn in if_tag.getElementsByTagName(u"method"):
693
if cn.getAttribute(u"name") == u"Get":
694
for arg in cn.getElementsByTagName(u"arg"):
695
if (arg.getAttribute(u"direction")
697
arg.setAttribute(u"name", u"value")
698
elif cn.getAttribute(u"name") == u"GetAll":
699
for arg in cn.getElementsByTagName(u"arg"):
700
if (arg.getAttribute(u"direction")
702
arg.setAttribute(u"name", u"props")
703
xmlstring = document.toxml(u"utf-8")
745
704
document.unlink()
746
705
except (AttributeError, xml.dom.DOMException,
747
xml.parsers.expat.ExpatError) as error:
748
logger.error("Failed to override Introspection method",
706
xml.parsers.expat.ExpatError), error:
707
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
712
class ClientDBus(Client, DBusObjectWithProperties):
761
713
"""A Client class using D-Bus
777
729
# Only now, when this client is initialized, can it show up on
779
731
client_object_name = unicode(self.name).translate(
732
{ord(u"."): ord(u"_"),
733
ord(u"-"): ord(u"_")})
782
734
self.dbus_object_path = (dbus.ObjectPath
783
("/clients/" + client_object_name))
735
(u"/clients/" + client_object_name))
784
736
DBusObjectWithProperties.__init__(self, self.bus,
785
737
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
739
def _get_approvals_pending(self):
740
return self._approvals_pending
741
def _set_approvals_pending(self, value):
742
old_value = self._approvals_pending
743
self._approvals_pending = value
745
if (hasattr(self, "dbus_object_path")
746
and bval is not bool(old_value)):
747
dbus_bool = dbus.Boolean(bval, variant_level=1)
748
self.PropertyChanged(dbus.String(u"ApprovalPending"),
751
approvals_pending = property(_get_approvals_pending,
752
_set_approvals_pending)
753
del _get_approvals_pending, _set_approvals_pending
756
def _datetime_to_dbus(dt, variant_level=0):
757
"""Convert a UTC datetime.datetime() to a D-Bus type."""
758
return dbus.String(dt.isoformat(),
759
variant_level=variant_level)
762
oldstate = getattr(self, u"enabled", False)
763
r = Client.enable(self)
764
if oldstate != self.enabled:
766
self.PropertyChanged(dbus.String(u"Enabled"),
767
dbus.Boolean(True, variant_level=1))
768
self.PropertyChanged(
769
dbus.String(u"LastEnabled"),
770
self._datetime_to_dbus(self.last_enabled,
774
def disable(self, quiet = False):
775
oldstate = getattr(self, u"enabled", False)
776
r = Client.disable(self, quiet=quiet)
777
if not quiet and oldstate != self.enabled:
779
self.PropertyChanged(dbus.String(u"Enabled"),
780
dbus.Boolean(False, variant_level=1))
843
783
def __del__(self, *args, **kwargs):
845
785
self.remove_from_connection()
846
786
except LookupError:
848
if hasattr(DBusObjectWithProperties, "__del__"):
788
if hasattr(DBusObjectWithProperties, u"__del__"):
849
789
DBusObjectWithProperties.__del__(self, *args, **kwargs)
850
790
Client.__del__(self, *args, **kwargs)
868
811
return Client.checker_callback(self, pid, condition, command,
814
def checked_ok(self, *args, **kwargs):
815
r = Client.checked_ok(self, *args, **kwargs)
817
self.PropertyChanged(
818
dbus.String(u"LastCheckedOK"),
819
(self._datetime_to_dbus(self.last_checked_ok,
823
def need_approval(self, *args, **kwargs):
824
r = Client.need_approval(self, *args, **kwargs)
826
self.PropertyChanged(
827
dbus.String(u"LastApprovalRequest"),
828
(self._datetime_to_dbus(self.last_approval_request,
871
832
def start_checker(self, *args, **kwargs):
872
833
old_checker = self.checker
873
834
if self.checker is not None:
880
841
and old_checker_pid != self.checker.pid):
881
842
# Emit D-Bus signal
882
843
self.CheckerStarted(self.current_checker_command)
844
self.PropertyChanged(
845
dbus.String(u"CheckerRunning"),
846
dbus.Boolean(True, variant_level=1))
849
def stop_checker(self, *args, **kwargs):
850
old_checker = getattr(self, u"checker", None)
851
r = Client.stop_checker(self, *args, **kwargs)
852
if (old_checker is not None
853
and getattr(self, u"checker", None) is None):
854
self.PropertyChanged(dbus.String(u"CheckerRunning"),
855
dbus.Boolean(False, variant_level=1))
885
858
def _reset_approved(self):
886
859
self._approved = None
889
862
def approve(self, value=True):
890
863
self.send_changedstate()
891
864
self._approved = value
892
gobject.timeout_add(_timedelta_to_milliseconds
865
gobject.timeout_add(self._timedelta_to_milliseconds
893
866
(self.approval_duration),
894
867
self._reset_approved)
897
870
## D-Bus methods, signals & properties
898
_interface = "se.bsnet.fukt.Mandos.Client"
871
_interface = u"se.bsnet.fukt.Mandos.Client"
902
875
# CheckerCompleted - signal
903
@dbus.service.signal(_interface, signature="nxs")
876
@dbus.service.signal(_interface, signature=u"nxs")
904
877
def CheckerCompleted(self, exitcode, waitstatus, command):
908
881
# CheckerStarted - signal
909
@dbus.service.signal(_interface, signature="s")
882
@dbus.service.signal(_interface, signature=u"s")
910
883
def CheckerStarted(self, command):
914
887
# PropertyChanged - signal
915
@dbus.service.signal(_interface, signature="sv")
888
@dbus.service.signal(_interface, signature=u"sv")
916
889
def PropertyChanged(self, property, value):
978
951
# ApprovalPending - property
979
@dbus_service_property(_interface, signature="b", access="read")
952
@dbus_service_property(_interface, signature=u"b", access=u"read")
980
953
def ApprovalPending_dbus_property(self):
981
954
return dbus.Boolean(bool(self.approvals_pending))
983
956
# ApprovedByDefault - property
984
@dbus_service_property(_interface, signature="b",
957
@dbus_service_property(_interface, signature=u"b",
986
959
def ApprovedByDefault_dbus_property(self, value=None):
987
960
if value is None: # get
988
961
return dbus.Boolean(self.approved_by_default)
989
962
self.approved_by_default = bool(value)
964
self.PropertyChanged(dbus.String(u"ApprovedByDefault"),
965
dbus.Boolean(value, variant_level=1))
991
967
# ApprovalDelay - property
992
@dbus_service_property(_interface, signature="t",
968
@dbus_service_property(_interface, signature=u"t",
994
970
def ApprovalDelay_dbus_property(self, value=None):
995
971
if value is None: # get
996
972
return dbus.UInt64(self.approval_delay_milliseconds())
997
973
self.approval_delay = datetime.timedelta(0, 0, 0, value)
975
self.PropertyChanged(dbus.String(u"ApprovalDelay"),
976
dbus.UInt64(value, variant_level=1))
999
978
# ApprovalDuration - property
1000
@dbus_service_property(_interface, signature="t",
979
@dbus_service_property(_interface, signature=u"t",
1002
981
def ApprovalDuration_dbus_property(self, value=None):
1003
982
if value is None: # get
1004
return dbus.UInt64(_timedelta_to_milliseconds(
983
return dbus.UInt64(self._timedelta_to_milliseconds(
1005
984
self.approval_duration))
1006
985
self.approval_duration = datetime.timedelta(0, 0, 0, value)
987
self.PropertyChanged(dbus.String(u"ApprovalDuration"),
988
dbus.UInt64(value, variant_level=1))
1008
990
# Name - property
1009
@dbus_service_property(_interface, signature="s", access="read")
991
@dbus_service_property(_interface, signature=u"s", access=u"read")
1010
992
def Name_dbus_property(self):
1011
993
return dbus.String(self.name)
1013
995
# Fingerprint - property
1014
@dbus_service_property(_interface, signature="s", access="read")
996
@dbus_service_property(_interface, signature=u"s", access=u"read")
1015
997
def Fingerprint_dbus_property(self):
1016
998
return dbus.String(self.fingerprint)
1018
1000
# Host - property
1019
@dbus_service_property(_interface, signature="s",
1001
@dbus_service_property(_interface, signature=u"s",
1002
access=u"readwrite")
1021
1003
def Host_dbus_property(self, value=None):
1022
1004
if value is None: # get
1023
1005
return dbus.String(self.host)
1024
1006
self.host = value
1008
self.PropertyChanged(dbus.String(u"Host"),
1009
dbus.String(value, variant_level=1))
1026
1011
# Created - property
1027
@dbus_service_property(_interface, signature="s", access="read")
1012
@dbus_service_property(_interface, signature=u"s", access=u"read")
1028
1013
def Created_dbus_property(self):
1029
return dbus.String(datetime_to_dbus(self.created))
1014
return dbus.String(self._datetime_to_dbus(self.created))
1031
1016
# LastEnabled - property
1032
@dbus_service_property(_interface, signature="s", access="read")
1017
@dbus_service_property(_interface, signature=u"s", access=u"read")
1033
1018
def LastEnabled_dbus_property(self):
1034
return datetime_to_dbus(self.last_enabled)
1019
if self.last_enabled is None:
1020
return dbus.String(u"")
1021
return dbus.String(self._datetime_to_dbus(self.last_enabled))
1036
1023
# Enabled - property
1037
@dbus_service_property(_interface, signature="b",
1024
@dbus_service_property(_interface, signature=u"b",
1025
access=u"readwrite")
1039
1026
def Enabled_dbus_property(self, value=None):
1040
1027
if value is None: # get
1041
1028
return dbus.Boolean(self.enabled)
1047
1034
# LastCheckedOK - property
1048
@dbus_service_property(_interface, signature="s",
1035
@dbus_service_property(_interface, signature=u"s",
1036
access=u"readwrite")
1050
1037
def LastCheckedOK_dbus_property(self, value=None):
1051
1038
if value is not None:
1052
1039
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)
1041
if self.last_checked_ok is None:
1042
return dbus.String(u"")
1043
return dbus.String(self._datetime_to_dbus(self
1061
1046
# LastApprovalRequest - property
1062
@dbus_service_property(_interface, signature="s", access="read")
1047
@dbus_service_property(_interface, signature=u"s", access=u"read")
1063
1048
def LastApprovalRequest_dbus_property(self):
1064
return datetime_to_dbus(self.last_approval_request)
1049
if self.last_approval_request is None:
1050
return dbus.String(u"")
1051
return dbus.String(self.
1052
_datetime_to_dbus(self
1053
.last_approval_request))
1066
1055
# Timeout - property
1067
@dbus_service_property(_interface, signature="t",
1056
@dbus_service_property(_interface, signature=u"t",
1057
access=u"readwrite")
1069
1058
def Timeout_dbus_property(self, value=None):
1070
1059
if value is None: # get
1071
1060
return dbus.UInt64(self.timeout_milliseconds())
1072
1061
self.timeout = datetime.timedelta(0, 0, 0, value)
1073
if getattr(self, "disable_initiator_tag", None) is None:
1063
self.PropertyChanged(dbus.String(u"Timeout"),
1064
dbus.UInt64(value, variant_level=1))
1065
if getattr(self, u"disable_initiator_tag", None) is None:
1075
1067
# Reschedule timeout
1076
1068
gobject.source_remove(self.disable_initiator_tag)
1077
1069
self.disable_initiator_tag = None
1079
1070
time_to_die = (self.
1080
1071
_timedelta_to_milliseconds((self
1081
1072
.last_checked_ok
1086
1077
# The timeout has passed
1089
self.expires = (datetime.datetime.utcnow()
1090
+ datetime.timedelta(milliseconds = time_to_die))
1091
1080
self.disable_initiator_tag = (gobject.timeout_add
1092
1081
(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
1083
# Interval - property
1103
@dbus_service_property(_interface, signature="t",
1084
@dbus_service_property(_interface, signature=u"t",
1085
access=u"readwrite")
1105
1086
def Interval_dbus_property(self, value=None):
1106
1087
if value is None: # get
1107
1088
return dbus.UInt64(self.interval_milliseconds())
1108
1089
self.interval = datetime.timedelta(0, 0, 0, value)
1109
if getattr(self, "checker_initiator_tag", None) is None:
1091
self.PropertyChanged(dbus.String(u"Interval"),
1092
dbus.UInt64(value, variant_level=1))
1093
if getattr(self, u"checker_initiator_tag", None) is None:
1111
1095
# Reschedule checker run
1112
1096
gobject.source_remove(self.checker_initiator_tag)
1115
1099
self.start_checker() # Start one now, too
1117
1101
# Checker - property
1118
@dbus_service_property(_interface, signature="s",
1102
@dbus_service_property(_interface, signature=u"s",
1103
access=u"readwrite")
1120
1104
def Checker_dbus_property(self, value=None):
1121
1105
if value is None: # get
1122
1106
return dbus.String(self.checker_command)
1123
1107
self.checker_command = value
1109
self.PropertyChanged(dbus.String(u"Checker"),
1110
dbus.String(self.checker_command,
1125
1113
# CheckerRunning - property
1126
@dbus_service_property(_interface, signature="b",
1114
@dbus_service_property(_interface, signature=u"b",
1115
access=u"readwrite")
1128
1116
def CheckerRunning_dbus_property(self, value=None):
1129
1117
if value is None: # get
1130
1118
return dbus.Boolean(self.checker is not None)
1196
1184
# no X.509 keys are added to it. Therefore, we can use it
1197
1185
# here despite using OpenPGP certificates.
1199
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1200
# "+AES-256-CBC", "+SHA1",
1201
# "+COMP-NULL", "+CTYPE-OPENPGP",
1187
#priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
1188
# u"+AES-256-CBC", u"+SHA1",
1189
# u"+COMP-NULL", u"+CTYPE-OPENPGP",
1203
1191
# Use a fallback default, since this MUST be set.
1204
1192
priority = self.server.gnutls_priority
1205
1193
if priority is None:
1194
priority = u"NORMAL"
1207
1195
(gnutls.library.functions
1208
1196
.gnutls_priority_set_direct(session._c_object,
1209
1197
priority, None))
1211
1199
# Start communication using the Mandos protocol
1212
1200
# Get protocol number
1213
1201
line = self.request.makefile().readline()
1214
logger.debug("Protocol version: %r", line)
1202
logger.debug(u"Protocol version: %r", line)
1216
1204
if int(line.strip().split()[0]) > 1:
1217
1205
raise RuntimeError
1218
except (ValueError, IndexError, RuntimeError) as error:
1219
logger.error("Unknown protocol version: %s", error)
1206
except (ValueError, IndexError, RuntimeError), error:
1207
logger.error(u"Unknown protocol version: %s", error)
1222
1210
# Start GnuTLS connection
1224
1212
session.handshake()
1225
except gnutls.errors.GNUTLSError as error:
1226
logger.warning("Handshake failed: %s", error)
1213
except gnutls.errors.GNUTLSError, error:
1214
logger.warning(u"Handshake failed: %s", error)
1227
1215
# Do not run session.bye() here: the session is not
1228
1216
# established. Just abandon the request.
1230
logger.debug("Handshake succeeded")
1218
logger.debug(u"Handshake succeeded")
1232
1220
approval_required = False
1235
1223
fpr = self.fingerprint(self.peer_certificate
1238
gnutls.errors.GNUTLSError) as error:
1239
logger.warning("Bad certificate: %s", error)
1225
except (TypeError, gnutls.errors.GNUTLSError), error:
1226
logger.warning(u"Bad certificate: %s", error)
1241
logger.debug("Fingerprint: %s", fpr)
1228
logger.debug(u"Fingerprint: %s", fpr)
1244
1231
client = ProxyClient(child_pipe, fpr,
1445
1432
bind to an address or port if they were not specified."""
1446
1433
if self.interface is not None:
1447
1434
if SO_BINDTODEVICE is None:
1448
logger.error("SO_BINDTODEVICE does not exist;"
1449
" cannot bind to interface %s",
1435
logger.error(u"SO_BINDTODEVICE does not exist;"
1436
u" cannot bind to interface %s",
1450
1437
self.interface)
1453
1440
self.socket.setsockopt(socket.SOL_SOCKET,
1454
1441
SO_BINDTODEVICE,
1455
1442
str(self.interface
1457
except socket.error as error:
1444
except socket.error, error:
1458
1445
if error[0] == errno.EPERM:
1459
logger.error("No permission to"
1460
" bind to interface %s",
1446
logger.error(u"No permission to"
1447
u" bind to interface %s",
1461
1448
self.interface)
1462
1449
elif error[0] == errno.ENOPROTOOPT:
1463
logger.error("SO_BINDTODEVICE not available;"
1464
" cannot bind to interface %s",
1450
logger.error(u"SO_BINDTODEVICE not available;"
1451
u" cannot bind to interface %s",
1465
1452
self.interface)
1524
1511
def handle_ipc(self, source, condition, parent_pipe=None,
1525
1512
client_object=None):
1526
1513
condition_names = {
1527
gobject.IO_IN: "IN", # There is data to read.
1528
gobject.IO_OUT: "OUT", # Data can be written (without
1514
gobject.IO_IN: u"IN", # There is data to read.
1515
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
1517
gobject.IO_PRI: u"PRI", # There is urgent data to read.
1518
gobject.IO_ERR: u"ERR", # Error condition.
1519
gobject.IO_HUP: u"HUP" # Hung up (the connection has been
1533
1520
# broken, usually for pipes and
1595
1582
def string_to_delta(interval):
1596
1583
"""Parse a string and return a datetime.timedelta
1598
>>> string_to_delta('7d')
1585
>>> string_to_delta(u'7d')
1599
1586
datetime.timedelta(7)
1600
>>> string_to_delta('60s')
1587
>>> string_to_delta(u'60s')
1601
1588
datetime.timedelta(0, 60)
1602
>>> string_to_delta('60m')
1589
>>> string_to_delta(u'60m')
1603
1590
datetime.timedelta(0, 3600)
1604
>>> string_to_delta('24h')
1591
>>> string_to_delta(u'24h')
1605
1592
datetime.timedelta(1)
1606
>>> string_to_delta('1w')
1593
>>> string_to_delta(u'1w')
1607
1594
datetime.timedelta(7)
1608
>>> string_to_delta('5m 30s')
1595
>>> string_to_delta(u'5m 30s')
1609
1596
datetime.timedelta(0, 330)
1611
1598
timevalue = datetime.timedelta(0)
1614
1601
suffix = unicode(s[-1])
1615
1602
value = int(s[:-1])
1617
1604
delta = datetime.timedelta(value)
1605
elif suffix == u"s":
1619
1606
delta = datetime.timedelta(0, value)
1607
elif suffix == u"m":
1621
1608
delta = datetime.timedelta(0, 0, 0, 0, value)
1609
elif suffix == u"h":
1623
1610
delta = datetime.timedelta(0, 0, 0, 0, 0, value)
1611
elif suffix == u"w":
1625
1612
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))
1614
raise ValueError(u"Unknown suffix %r" % suffix)
1615
except (ValueError, IndexError), e:
1616
raise ValueError(e.message)
1630
1617
timevalue += delta
1631
1618
return timevalue
1638
1625
global if_nametoindex
1640
1627
if_nametoindex = (ctypes.cdll.LoadLibrary
1641
(ctypes.util.find_library("c"))
1628
(ctypes.util.find_library(u"c"))
1642
1629
.if_nametoindex)
1643
1630
except (OSError, AttributeError):
1644
logger.warning("Doing if_nametoindex the hard way")
1631
logger.warning(u"Doing if_nametoindex the hard way")
1645
1632
def if_nametoindex(interface):
1646
1633
"Get an interface index the hard way, i.e. using fcntl()"
1647
1634
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
1648
1635
with contextlib.closing(socket.socket()) as s:
1649
1636
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1650
struct.pack(str("16s16x"),
1637
struct.pack(str(u"16s16x"),
1652
interface_index = struct.unpack(str("I"),
1639
interface_index = struct.unpack(str(u"I"),
1653
1640
ifreq[16:20])[0]
1654
1641
return interface_index
1655
1642
return if_nametoindex(interface)
1685
1672
##################################################################
1686
1673
# 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()
1675
parser = optparse.OptionParser(version = "%%prog %s" % version)
1676
parser.add_option("-i", u"--interface", type=u"string",
1677
metavar="IF", help=u"Bind to interface IF")
1678
parser.add_option("-a", u"--address", type=u"string",
1679
help=u"Address to listen for requests on")
1680
parser.add_option("-p", u"--port", type=u"int",
1681
help=u"Port number to receive requests on")
1682
parser.add_option("--check", action=u"store_true",
1683
help=u"Run self-test")
1684
parser.add_option("--debug", action=u"store_true",
1685
help=u"Debug mode; run in foreground and log to"
1687
parser.add_option("--debuglevel", type=u"string", metavar="LEVEL",
1688
help=u"Debug level for stdout output")
1689
parser.add_option("--priority", type=u"string", help=u"GnuTLS"
1690
u" priority string (see GnuTLS documentation)")
1691
parser.add_option("--servicename", type=u"string",
1692
metavar=u"NAME", help=u"Zeroconf service name")
1693
parser.add_option("--configdir", type=u"string",
1694
default=u"/etc/mandos", metavar=u"DIR",
1695
help=u"Directory to search for configuration"
1697
parser.add_option("--no-dbus", action=u"store_false",
1698
dest=u"use_dbus", help=u"Do not provide D-Bus"
1699
u" system bus interface")
1700
parser.add_option("--no-ipv6", action=u"store_false",
1701
dest=u"use_ipv6", help=u"Do not use IPv6")
1702
options = parser.parse_args()[0]
1720
1704
if options.check:
1725
1709
# Default values for config file for server-global settings
1726
server_defaults = { "interface": "",
1731
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1732
"servicename": "Mandos",
1710
server_defaults = { u"interface": u"",
1715
u"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1716
u"servicename": u"Mandos",
1717
u"use_dbus": u"True",
1718
u"use_ipv6": u"True",
1738
1722
# Parse config file for server-global settings
1739
1723
server_config = configparser.SafeConfigParser(server_defaults)
1740
1724
del server_defaults
1741
1725
server_config.read(os.path.join(options.configdir,
1743
1727
# Convert the SafeConfigParser object to a dict
1744
1728
server_settings = server_config.defaults()
1745
1729
# 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",
1730
for option in (u"debug", u"use_dbus", u"use_ipv6"):
1731
server_settings[option] = server_config.getboolean(u"DEFAULT",
1749
1733
if server_settings["port"]:
1750
server_settings["port"] = server_config.getint("DEFAULT",
1734
server_settings["port"] = server_config.getint(u"DEFAULT",
1752
1736
del server_config
1754
1738
# Override the settings from the config file with command line
1755
1739
# options, if set.
1756
for option in ("interface", "address", "port", "debug",
1757
"priority", "servicename", "configdir",
1758
"use_dbus", "use_ipv6", "debuglevel"):
1740
for option in (u"interface", u"address", u"port", u"debug",
1741
u"priority", u"servicename", u"configdir",
1742
u"use_dbus", u"use_ipv6", u"debuglevel"):
1759
1743
value = getattr(options, option)
1760
1744
if value is not None:
1761
1745
server_settings[option] = value
1769
1753
##################################################################
1771
1755
# 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"]
1756
debug = server_settings[u"debug"]
1757
debuglevel = server_settings[u"debuglevel"]
1758
use_dbus = server_settings[u"use_dbus"]
1759
use_ipv6 = server_settings[u"use_ipv6"]
1777
if server_settings["servicename"] != "Mandos":
1761
if server_settings[u"servicename"] != u"Mandos":
1778
1762
syslogger.setFormatter(logging.Formatter
1779
('Mandos (%s) [%%(process)d]:'
1780
' %%(levelname)s: %%(message)s'
1781
% server_settings["servicename"]))
1763
(u'Mandos (%s) [%%(process)d]:'
1764
u' %%(levelname)s: %%(message)s'
1765
% server_settings[u"servicename"]))
1783
1767
# 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",
1768
client_defaults = { u"timeout": u"1h",
1770
u"checker": u"fping -q -- %%(host)s",
1772
u"approval_delay": u"0s",
1773
u"approval_duration": u"1s",
1792
1775
client_config = configparser.SafeConfigParser(client_defaults)
1793
client_config.read(os.path.join(server_settings["configdir"],
1776
client_config.read(os.path.join(server_settings[u"configdir"],
1796
1779
global mandos_dbus_service
1797
1780
mandos_dbus_service = None
1799
tcp_server = MandosServer((server_settings["address"],
1800
server_settings["port"]),
1782
tcp_server = MandosServer((server_settings[u"address"],
1783
server_settings[u"port"]),
1802
interface=(server_settings["interface"]
1785
interface=(server_settings[u"interface"]
1804
1787
use_ipv6=use_ipv6,
1805
1788
gnutls_priority=
1806
server_settings["priority"],
1789
server_settings[u"priority"],
1807
1790
use_dbus=use_dbus)
1809
pidfilename = "/var/run/mandos.pid"
1792
pidfilename = u"/var/run/mandos.pid"
1811
pidfile = open(pidfilename, "w")
1794
pidfile = open(pidfilename, u"w")
1812
1795
except IOError:
1813
logger.error("Could not open file %r", pidfilename)
1796
logger.error(u"Could not open file %r", pidfilename)
1816
uid = pwd.getpwnam("_mandos").pw_uid
1817
gid = pwd.getpwnam("_mandos").pw_gid
1799
uid = pwd.getpwnam(u"_mandos").pw_uid
1800
gid = pwd.getpwnam(u"_mandos").pw_gid
1818
1801
except KeyError:
1820
uid = pwd.getpwnam("mandos").pw_uid
1821
gid = pwd.getpwnam("mandos").pw_gid
1803
uid = pwd.getpwnam(u"mandos").pw_uid
1804
gid = pwd.getpwnam(u"mandos").pw_gid
1822
1805
except KeyError:
1824
uid = pwd.getpwnam("nobody").pw_uid
1825
gid = pwd.getpwnam("nobody").pw_gid
1807
uid = pwd.getpwnam(u"nobody").pw_uid
1808
gid = pwd.getpwnam(u"nobody").pw_gid
1826
1809
except KeyError:
1832
except OSError as error:
1815
except OSError, error:
1833
1816
if error[0] != errno.EPERM:
1877
1860
# End of Avahi example code
1880
bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
1863
bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos",
1881
1864
bus, do_not_queue=True)
1882
except dbus.exceptions.NameExistsException as e:
1883
logger.error(unicode(e) + ", disabling D-Bus")
1865
except dbus.exceptions.NameExistsException, e:
1866
logger.error(unicode(e) + u", disabling D-Bus")
1884
1867
use_dbus = False
1885
server_settings["use_dbus"] = False
1868
server_settings[u"use_dbus"] = False
1886
1869
tcp_server.use_dbus = False
1887
1870
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1888
service = AvahiService(name = server_settings["servicename"],
1889
servicetype = "_mandos._tcp",
1871
service = AvahiService(name = server_settings[u"servicename"],
1872
servicetype = u"_mandos._tcp",
1890
1873
protocol = protocol, bus = bus)
1891
1874
if server_settings["interface"]:
1892
1875
service.interface = (if_nametoindex
1893
(str(server_settings["interface"])))
1876
(str(server_settings[u"interface"])))
1895
1878
global multiprocessing_manager
1896
1879
multiprocessing_manager = multiprocessing.Manager()
1941
1924
class MandosDBusService(dbus.service.Object):
1942
1925
"""A D-Bus proxy object"""
1943
1926
def __init__(self):
1944
dbus.service.Object.__init__(self, bus, "/")
1945
_interface = "se.bsnet.fukt.Mandos"
1927
dbus.service.Object.__init__(self, bus, u"/")
1928
_interface = u"se.bsnet.fukt.Mandos"
1947
@dbus.service.signal(_interface, signature="o")
1930
@dbus.service.signal(_interface, signature=u"o")
1948
1931
def ClientAdded(self, objpath):
1952
@dbus.service.signal(_interface, signature="ss")
1935
@dbus.service.signal(_interface, signature=u"ss")
1953
1936
def ClientNotFound(self, fingerprint, address):
1957
@dbus.service.signal(_interface, signature="os")
1940
@dbus.service.signal(_interface, signature=u"os")
1958
1941
def ClientRemoved(self, objpath, name):
1962
@dbus.service.method(_interface, out_signature="ao")
1945
@dbus.service.method(_interface, out_signature=u"ao")
1963
1946
def GetAllClients(self):
1965
1948
return dbus.Array(c.dbus_object_path
1966
1949
for c in tcp_server.clients)
1968
1951
@dbus.service.method(_interface,
1969
out_signature="a{oa{sv}}")
1952
out_signature=u"a{oa{sv}}")
1970
1953
def GetAllClientsWithProperties(self):
1972
1955
return dbus.Dictionary(
1973
((c.dbus_object_path, c.GetAll(""))
1956
((c.dbus_object_path, c.GetAll(u""))
1974
1957
for c in tcp_server.clients),
1958
signature=u"oa{sv}")
1977
@dbus.service.method(_interface, in_signature="o")
1960
@dbus.service.method(_interface, in_signature=u"o")
1978
1961
def RemoveClient(self, object_path):
1980
1963
for c in tcp_server.clients:
2046
2029
(tcp_server.handle_request
2047
2030
(*args[2:], **kwargs) or True))
2049
logger.debug("Starting main loop")
2032
logger.debug(u"Starting main loop")
2050
2033
main_loop.run()
2051
except AvahiError as error:
2052
logger.critical("AvahiError: %s", error)
2034
except AvahiError, error:
2035
logger.critical(u"AvahiError: %s", error)
2055
2038
except KeyboardInterrupt:
2057
print("", file=sys.stderr)
2058
logger.debug("Server received KeyboardInterrupt")
2059
logger.debug("Server exiting")
2041
logger.debug(u"Server received KeyboardInterrupt")
2042
logger.debug(u"Server exiting")
2060
2043
# Must run before the D-Bus bus name gets deregistered