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())
268
240
"""A representation of a client host served by this server.
271
_approved: bool(); 'None' if not yet approved/disapproved
272
approval_delay: datetime.timedelta(); Time to wait for approval
273
approval_duration: datetime.timedelta(); Duration of one approval
243
name: string; from the config file, used in log messages and
245
fingerprint: string (40 or 32 hexadecimal digits); used to
246
uniquely identify the client
247
secret: bytestring; sent verbatim (over TLS) to client
248
host: string; available for use by the checker command
249
created: datetime.datetime(); (UTC) object creation
250
last_enabled: datetime.datetime(); (UTC)
252
last_checked_ok: datetime.datetime(); (UTC) or None
253
timeout: datetime.timedelta(); How long from last_checked_ok
254
until this client is disabled
255
interval: datetime.timedelta(); How often to start a new checker
256
disable_hook: If set, called by disable() as disable_hook(self)
274
257
checker: subprocess.Popen(); a running checker process used
275
258
to see if the client lives.
276
259
'None' if no process is running.
277
checker_callback_tag: a gobject event source tag, or None
278
checker_command: string; External command which is run to check
279
if client lives. %() expansions are done at
260
checker_initiator_tag: a gobject event source tag, or None
261
disable_initiator_tag: - '' -
262
checker_callback_tag: - '' -
263
checker_command: string; External command which is run to check if
264
client lives. %() expansions are done at
280
265
runtime with vars(self) as dict, so that for
281
266
instance %(name)s can be used in the command.
282
checker_initiator_tag: a gobject event source tag, or None
283
created: datetime.datetime(); (UTC) object creation
284
267
current_checker_command: string; current running checker_command
285
disable_hook: If set, called by disable() as disable_hook(self)
286
disable_initiator_tag: a gobject event source tag, or None
288
fingerprint: string (40 or 32 hexadecimal digits); used to
289
uniquely identify the client
290
host: string; available for use by the checker command
291
interval: datetime.timedelta(); How often to start a new checker
292
last_approval_request: datetime.datetime(); (UTC) or None
293
last_checked_ok: datetime.datetime(); (UTC) or None
294
last_enabled: datetime.datetime(); (UTC)
295
name: string; from the config file, used in log messages and
297
secret: bytestring; sent verbatim (over TLS) to client
298
timeout: datetime.timedelta(); How long from last_checked_ok
299
until this client is disabled
300
extended_timeout: extra long timeout when password has been sent
301
runtime_expansions: Allowed attributes for runtime expansion.
302
expires: datetime.datetime(); time (UTC) when a client will be
268
approval_delay: datetime.timedelta(); Time to wait for approval
269
_approved: bool(); 'None' if not yet approved/disapproved
270
approval_duration: datetime.timedelta(); Duration of one approval
306
runtime_expansions = ("approval_delay", "approval_duration",
307
"created", "enabled", "fingerprint",
308
"host", "interval", "last_checked_ok",
309
"last_enabled", "name", "timeout")
312
274
def _timedelta_to_milliseconds(td):
313
275
"Convert a datetime.timedelta() to milliseconds"
338
296
if config is None:
340
logger.debug("Creating client %r", self.name)
298
logger.debug(u"Creating client %r", self.name)
341
299
# Uppercase and remove spaces from fingerprint for later
342
300
# comparison purposes with return value from the fingerprint()
344
self.fingerprint = (config["fingerprint"].upper()
346
logger.debug(" Fingerprint: %s", self.fingerprint)
347
if "secret" in config:
348
self.secret = config["secret"].decode("base64")
349
elif "secfile" in config:
302
self.fingerprint = (config[u"fingerprint"].upper()
304
logger.debug(u" Fingerprint: %s", self.fingerprint)
305
if u"secret" in config:
306
self.secret = config[u"secret"].decode(u"base64")
307
elif u"secfile" in config:
350
308
with open(os.path.expanduser(os.path.expandvars
351
(config["secfile"])),
309
(config[u"secfile"])),
352
310
"rb") as secfile:
353
311
self.secret = secfile.read()
355
raise TypeError("No secret or secfile for client %s"
313
raise TypeError(u"No secret or secfile for client %s"
357
self.host = config.get("host", "")
315
self.host = config.get(u"host", u"")
358
316
self.created = datetime.datetime.utcnow()
359
317
self.enabled = False
360
self.last_approval_request = None
361
318
self.last_enabled = None
362
319
self.last_checked_ok = None
363
self.timeout = string_to_delta(config["timeout"])
364
self.extended_timeout = string_to_delta(config["extended_timeout"])
365
self.interval = string_to_delta(config["interval"])
320
self.timeout = string_to_delta(config[u"timeout"])
321
self.interval = string_to_delta(config[u"interval"])
366
322
self.disable_hook = disable_hook
367
323
self.checker = None
368
324
self.checker_initiator_tag = None
369
325
self.disable_initiator_tag = None
371
326
self.checker_callback_tag = None
372
self.checker_command = config["checker"]
327
self.checker_command = config[u"checker"]
373
328
self.current_checker_command = None
374
329
self.last_connect = None
375
330
self._approved = None
376
self.approved_by_default = config.get("approved_by_default",
331
self.approved_by_default = config.get(u"approved_by_default",
378
333
self.approvals_pending = 0
379
334
self.approval_delay = string_to_delta(
380
config["approval_delay"])
335
config[u"approval_delay"])
381
336
self.approval_duration = string_to_delta(
382
config["approval_duration"])
337
config[u"approval_duration"])
383
338
self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
385
340
def send_changedstate(self):
441
394
if os.WIFEXITED(condition):
442
395
exitstatus = os.WEXITSTATUS(condition)
443
396
if exitstatus == 0:
444
logger.info("Checker for %(name)s succeeded",
397
logger.info(u"Checker for %(name)s succeeded",
446
399
self.checked_ok()
448
logger.info("Checker for %(name)s failed",
401
logger.info(u"Checker for %(name)s failed",
451
logger.warning("Checker for %(name)s crashed?",
404
logger.warning(u"Checker for %(name)s crashed?",
454
def checked_ok(self, timeout=None):
407
def checked_ok(self):
455
408
"""Bump up the timeout for this client.
457
410
This should only be called when the client has been seen,
461
timeout = self.timeout
462
413
self.last_checked_ok = datetime.datetime.utcnow()
463
414
gobject.source_remove(self.disable_initiator_tag)
464
self.expires = datetime.datetime.utcnow() + timeout
465
415
self.disable_initiator_tag = (gobject.timeout_add
466
(self._timedelta_to_milliseconds(timeout),
416
(self.timeout_milliseconds(),
469
def need_approval(self):
470
self.last_approval_request = datetime.datetime.utcnow()
472
419
def start_checker(self):
473
420
"""Start a new checker subprocess if one is not running.
503
450
command = self.checker_command % self.host
504
451
except TypeError:
505
452
# Escape attributes for the shell
506
escaped_attrs = dict(
508
re.escape(unicode(str(getattr(self, attr, "")),
512
self.runtime_expansions)
453
escaped_attrs = dict((key,
454
re.escape(unicode(str(val),
458
vars(self).iteritems())
515
460
command = self.checker_command % escaped_attrs
516
except TypeError as error:
517
logger.error('Could not format string "%s":'
518
' %s', self.checker_command, error)
461
except TypeError, error:
462
logger.error(u'Could not format string "%s":'
463
u' %s', self.checker_command, error)
519
464
return True # Try again later
520
465
self.current_checker_command = command
522
logger.info("Starting checker %r for %s",
467
logger.info(u"Starting checker %r for %s",
523
468
command, self.name)
524
469
# We don't need to redirect stdout and stderr, since
525
470
# in normal mode, that is already done by daemon(),
549
494
if self.checker_callback_tag:
550
495
gobject.source_remove(self.checker_callback_tag)
551
496
self.checker_callback_tag = None
552
if getattr(self, "checker", None) is None:
497
if getattr(self, u"checker", None) is None:
554
logger.debug("Stopping checker for %(name)s", vars(self))
499
logger.debug(u"Stopping checker for %(name)s", vars(self))
556
501
os.kill(self.checker.pid, signal.SIGTERM)
558
503
#if self.checker.poll() is None:
559
504
# os.kill(self.checker.pid, signal.SIGKILL)
560
except OSError as error:
505
except OSError, error:
561
506
if error.errno != errno.ESRCH: # No such process
563
508
self.checker = None
565
def dbus_service_property(dbus_interface, signature="v",
566
access="readwrite", byte_arrays=False):
510
def dbus_service_property(dbus_interface, signature=u"v",
511
access=u"readwrite", byte_arrays=False):
567
512
"""Decorators for marking methods of a DBusObjectWithProperties to
568
513
become properties on the D-Bus.
577
522
# Encoding deeply encoded byte arrays is not supported yet by the
578
523
# "Set" method, so we fail early here:
579
if byte_arrays and signature != "ay":
580
raise ValueError("Byte arrays not supported for non-'ay'"
581
" signature %r" % signature)
524
if byte_arrays and signature != u"ay":
525
raise ValueError(u"Byte arrays not supported for non-'ay'"
526
u" signature %r" % signature)
582
527
def decorator(func):
583
528
func._dbus_is_property = True
584
529
func._dbus_interface = dbus_interface
585
530
func._dbus_signature = signature
586
531
func._dbus_access = access
587
532
func._dbus_name = func.__name__
588
if func._dbus_name.endswith("_dbus_property"):
533
if func._dbus_name.endswith(u"_dbus_property"):
589
534
func._dbus_name = func._dbus_name[:-14]
590
func._dbus_get_args_options = {'byte_arrays': byte_arrays }
535
func._dbus_get_args_options = {u'byte_arrays': byte_arrays }
647
592
# No such property
648
raise DBusPropertyNotFound(self.dbus_object_path + ":"
649
+ interface_name + "."
593
raise DBusPropertyNotFound(self.dbus_object_path + u":"
594
+ interface_name + u"."
652
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
597
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ss",
654
599
def Get(self, interface_name, property_name):
655
600
"""Standard D-Bus property Get() method, see D-Bus standard.
657
602
prop = self._get_dbus_property(interface_name, property_name)
658
if prop._dbus_access == "write":
603
if prop._dbus_access == u"write":
659
604
raise DBusPropertyAccessException(property_name)
661
if not hasattr(value, "variant_level"):
606
if not hasattr(value, u"variant_level"):
663
608
return type(value)(value, variant_level=value.variant_level+1)
665
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
610
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ssv")
666
611
def Set(self, interface_name, property_name, value):
667
612
"""Standard D-Bus property Set() method, see D-Bus standard.
669
614
prop = self._get_dbus_property(interface_name, property_name)
670
if prop._dbus_access == "read":
615
if prop._dbus_access == u"read":
671
616
raise DBusPropertyAccessException(property_name)
672
if prop._dbus_get_args_options["byte_arrays"]:
617
if prop._dbus_get_args_options[u"byte_arrays"]:
673
618
# The byte_arrays option is not supported yet on
674
619
# signatures other than "ay".
675
if prop._dbus_signature != "ay":
620
if prop._dbus_signature != u"ay":
677
622
value = dbus.ByteArray(''.join(unichr(byte)
678
623
for byte in value))
681
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
682
out_signature="a{sv}")
626
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"s",
627
out_signature=u"a{sv}")
683
628
def GetAll(self, interface_name):
684
629
"""Standard D-Bus property GetAll() method, see D-Bus
716
661
document = xml.dom.minidom.parseString(xmlstring)
717
662
def make_tag(document, name, prop):
718
e = document.createElement("property")
719
e.setAttribute("name", name)
720
e.setAttribute("type", prop._dbus_signature)
721
e.setAttribute("access", prop._dbus_access)
663
e = document.createElement(u"property")
664
e.setAttribute(u"name", name)
665
e.setAttribute(u"type", prop._dbus_signature)
666
e.setAttribute(u"access", prop._dbus_access)
723
for if_tag in document.getElementsByTagName("interface"):
668
for if_tag in document.getElementsByTagName(u"interface"):
724
669
for tag in (make_tag(document, name, prop)
726
671
in self._get_all_dbus_properties()
727
672
if prop._dbus_interface
728
== if_tag.getAttribute("name")):
673
== if_tag.getAttribute(u"name")):
729
674
if_tag.appendChild(tag)
730
675
# Add the names to the return values for the
731
676
# "org.freedesktop.DBus.Properties" methods
732
if (if_tag.getAttribute("name")
733
== "org.freedesktop.DBus.Properties"):
734
for cn in if_tag.getElementsByTagName("method"):
735
if cn.getAttribute("name") == "Get":
736
for arg in cn.getElementsByTagName("arg"):
737
if (arg.getAttribute("direction")
739
arg.setAttribute("name", "value")
740
elif cn.getAttribute("name") == "GetAll":
741
for arg in cn.getElementsByTagName("arg"):
742
if (arg.getAttribute("direction")
744
arg.setAttribute("name", "props")
745
xmlstring = document.toxml("utf-8")
677
if (if_tag.getAttribute(u"name")
678
== u"org.freedesktop.DBus.Properties"):
679
for cn in if_tag.getElementsByTagName(u"method"):
680
if cn.getAttribute(u"name") == u"Get":
681
for arg in cn.getElementsByTagName(u"arg"):
682
if (arg.getAttribute(u"direction")
684
arg.setAttribute(u"name", u"value")
685
elif cn.getAttribute(u"name") == u"GetAll":
686
for arg in cn.getElementsByTagName(u"arg"):
687
if (arg.getAttribute(u"direction")
689
arg.setAttribute(u"name", u"props")
690
xmlstring = document.toxml(u"utf-8")
746
691
document.unlink()
747
692
except (AttributeError, xml.dom.DOMException,
748
xml.parsers.expat.ExpatError) as error:
749
logger.error("Failed to override Introspection method",
693
xml.parsers.expat.ExpatError), error:
694
logger.error(u"Failed to override Introspection method",
770
711
Client.__init__(self, *args, **kwargs)
771
712
# Only now, when this client is initialized, can it show up on
773
client_object_name = unicode(self.name).translate(
776
714
self.dbus_object_path = (dbus.ObjectPath
777
("/clients/" + client_object_name))
716
+ self.name.replace(u".", u"_")))
778
717
DBusObjectWithProperties.__init__(self, self.bus,
779
718
self.dbus_object_path)
780
def _set_expires(self, value):
781
old_value = getattr(self, "_expires", None)
782
self._expires = value
783
if hasattr(self, "dbus_object_path") and old_value != value:
784
dbus_time = (self._datetime_to_dbus(self._expires,
786
self.PropertyChanged(dbus.String("Expires"),
788
expires = property(lambda self: self._expires, _set_expires)
791
720
def _get_approvals_pending(self):
792
721
return self._approvals_pending
808
737
def _datetime_to_dbus(dt, variant_level=0):
809
738
"""Convert a UTC datetime.datetime() to a D-Bus type."""
811
return dbus.String("", variant_level = variant_level)
812
739
return dbus.String(dt.isoformat(),
813
740
variant_level=variant_level)
815
742
def enable(self):
816
oldstate = getattr(self, "enabled", False)
743
oldstate = getattr(self, u"enabled", False)
817
744
r = Client.enable(self)
818
745
if oldstate != self.enabled:
819
746
# Emit D-Bus signals
820
self.PropertyChanged(dbus.String("Enabled"),
747
self.PropertyChanged(dbus.String(u"Enabled"),
821
748
dbus.Boolean(True, variant_level=1))
822
749
self.PropertyChanged(
823
dbus.String("LastEnabled"),
750
dbus.String(u"LastEnabled"),
824
751
self._datetime_to_dbus(self.last_enabled,
825
752
variant_level=1))
828
755
def disable(self, quiet = False):
829
oldstate = getattr(self, "enabled", False)
756
oldstate = getattr(self, u"enabled", False)
830
757
r = Client.disable(self, quiet=quiet)
831
758
if not quiet and oldstate != self.enabled:
832
759
# Emit D-Bus signal
833
self.PropertyChanged(dbus.String("Enabled"),
760
self.PropertyChanged(dbus.String(u"Enabled"),
834
761
dbus.Boolean(False, variant_level=1))
868
795
def checked_ok(self, *args, **kwargs):
869
Client.checked_ok(self, *args, **kwargs)
796
r = Client.checked_ok(self, *args, **kwargs)
870
797
# Emit D-Bus signal
871
798
self.PropertyChanged(
872
dbus.String("LastCheckedOK"),
799
dbus.String(u"LastCheckedOK"),
873
800
(self._datetime_to_dbus(self.last_checked_ok,
874
801
variant_level=1)))
876
def need_approval(self, *args, **kwargs):
877
r = Client.need_approval(self, *args, **kwargs)
879
self.PropertyChanged(
880
dbus.String("LastApprovalRequest"),
881
(self._datetime_to_dbus(self.last_approval_request,
885
804
def start_checker(self, *args, **kwargs):
895
814
# Emit D-Bus signal
896
815
self.CheckerStarted(self.current_checker_command)
897
816
self.PropertyChanged(
898
dbus.String("CheckerRunning"),
817
dbus.String(u"CheckerRunning"),
899
818
dbus.Boolean(True, variant_level=1))
902
821
def stop_checker(self, *args, **kwargs):
903
old_checker = getattr(self, "checker", None)
822
old_checker = getattr(self, u"checker", None)
904
823
r = Client.stop_checker(self, *args, **kwargs)
905
824
if (old_checker is not None
906
and getattr(self, "checker", None) is None):
907
self.PropertyChanged(dbus.String("CheckerRunning"),
825
and getattr(self, u"checker", None) is None):
826
self.PropertyChanged(dbus.String(u"CheckerRunning"),
908
827
dbus.Boolean(False, variant_level=1))
923
842
## D-Bus methods, signals & properties
924
_interface = "se.bsnet.fukt.Mandos.Client"
843
_interface = u"se.bsnet.fukt.Mandos.Client"
928
847
# CheckerCompleted - signal
929
@dbus.service.signal(_interface, signature="nxs")
848
@dbus.service.signal(_interface, signature=u"nxs")
930
849
def CheckerCompleted(self, exitcode, waitstatus, command):
934
853
# CheckerStarted - signal
935
@dbus.service.signal(_interface, signature="s")
854
@dbus.service.signal(_interface, signature=u"s")
936
855
def CheckerStarted(self, command):
940
859
# PropertyChanged - signal
941
@dbus.service.signal(_interface, signature="sv")
860
@dbus.service.signal(_interface, signature=u"sv")
942
861
def PropertyChanged(self, property, value):
1004
923
# ApprovalPending - property
1005
@dbus_service_property(_interface, signature="b", access="read")
924
@dbus_service_property(_interface, signature=u"b", access=u"read")
1006
925
def ApprovalPending_dbus_property(self):
1007
926
return dbus.Boolean(bool(self.approvals_pending))
1009
928
# ApprovedByDefault - property
1010
@dbus_service_property(_interface, signature="b",
929
@dbus_service_property(_interface, signature=u"b",
1012
931
def ApprovedByDefault_dbus_property(self, value=None):
1013
932
if value is None: # get
1014
933
return dbus.Boolean(self.approved_by_default)
1015
old_value = self.approved_by_default
1016
934
self.approved_by_default = bool(value)
1017
935
# Emit D-Bus signal
1018
if old_value != self.approved_by_default:
1019
self.PropertyChanged(dbus.String("ApprovedByDefault"),
1020
dbus.Boolean(value, variant_level=1))
936
self.PropertyChanged(dbus.String(u"ApprovedByDefault"),
937
dbus.Boolean(value, variant_level=1))
1022
939
# ApprovalDelay - property
1023
@dbus_service_property(_interface, signature="t",
940
@dbus_service_property(_interface, signature=u"t",
1025
942
def ApprovalDelay_dbus_property(self, value=None):
1026
943
if value is None: # get
1027
944
return dbus.UInt64(self.approval_delay_milliseconds())
1028
old_value = self.approval_delay
1029
945
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1030
946
# Emit D-Bus signal
1031
if old_value != self.approval_delay:
1032
self.PropertyChanged(dbus.String("ApprovalDelay"),
1033
dbus.UInt64(value, variant_level=1))
947
self.PropertyChanged(dbus.String(u"ApprovalDelay"),
948
dbus.UInt64(value, variant_level=1))
1035
950
# ApprovalDuration - property
1036
@dbus_service_property(_interface, signature="t",
951
@dbus_service_property(_interface, signature=u"t",
1038
953
def ApprovalDuration_dbus_property(self, value=None):
1039
954
if value is None: # get
1040
955
return dbus.UInt64(self._timedelta_to_milliseconds(
1041
956
self.approval_duration))
1042
old_value = self.approval_duration
1043
957
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1044
958
# Emit D-Bus signal
1045
if old_value != self.approval_duration:
1046
self.PropertyChanged(dbus.String("ApprovalDuration"),
1047
dbus.UInt64(value, variant_level=1))
959
self.PropertyChanged(dbus.String(u"ApprovalDuration"),
960
dbus.UInt64(value, variant_level=1))
1049
962
# Name - property
1050
@dbus_service_property(_interface, signature="s", access="read")
963
@dbus_service_property(_interface, signature=u"s", access=u"read")
1051
964
def Name_dbus_property(self):
1052
965
return dbus.String(self.name)
1054
967
# Fingerprint - property
1055
@dbus_service_property(_interface, signature="s", access="read")
968
@dbus_service_property(_interface, signature=u"s", access=u"read")
1056
969
def Fingerprint_dbus_property(self):
1057
970
return dbus.String(self.fingerprint)
1059
972
# Host - property
1060
@dbus_service_property(_interface, signature="s",
973
@dbus_service_property(_interface, signature=u"s",
1062
975
def Host_dbus_property(self, value=None):
1063
976
if value is None: # get
1064
977
return dbus.String(self.host)
1065
old_value = self.host
1066
978
self.host = value
1067
979
# Emit D-Bus signal
1068
if old_value != self.host:
1069
self.PropertyChanged(dbus.String("Host"),
1070
dbus.String(value, variant_level=1))
980
self.PropertyChanged(dbus.String(u"Host"),
981
dbus.String(value, variant_level=1))
1072
983
# Created - property
1073
@dbus_service_property(_interface, signature="s", access="read")
984
@dbus_service_property(_interface, signature=u"s", access=u"read")
1074
985
def Created_dbus_property(self):
1075
986
return dbus.String(self._datetime_to_dbus(self.created))
1077
988
# LastEnabled - property
1078
@dbus_service_property(_interface, signature="s", access="read")
989
@dbus_service_property(_interface, signature=u"s", access=u"read")
1079
990
def LastEnabled_dbus_property(self):
1080
return self._datetime_to_dbus(self.last_enabled)
991
if self.last_enabled is None:
992
return dbus.String(u"")
993
return dbus.String(self._datetime_to_dbus(self.last_enabled))
1082
995
# Enabled - property
1083
@dbus_service_property(_interface, signature="b",
996
@dbus_service_property(_interface, signature=u"b",
1085
998
def Enabled_dbus_property(self, value=None):
1086
999
if value is None: # get
1087
1000
return dbus.Boolean(self.enabled)
1093
1006
# LastCheckedOK - property
1094
@dbus_service_property(_interface, signature="s",
1007
@dbus_service_property(_interface, signature=u"s",
1008
access=u"readwrite")
1096
1009
def LastCheckedOK_dbus_property(self, value=None):
1097
1010
if value is not None:
1098
1011
self.checked_ok()
1100
return self._datetime_to_dbus(self.last_checked_ok)
1102
# Expires - property
1103
@dbus_service_property(_interface, signature="s", access="read")
1104
def Expires_dbus_property(self):
1105
return self._datetime_to_dbus(self.expires)
1107
# LastApprovalRequest - property
1108
@dbus_service_property(_interface, signature="s", access="read")
1109
def LastApprovalRequest_dbus_property(self):
1110
return self._datetime_to_dbus(self.last_approval_request)
1013
if self.last_checked_ok is None:
1014
return dbus.String(u"")
1015
return dbus.String(self._datetime_to_dbus(self
1112
1018
# Timeout - property
1113
@dbus_service_property(_interface, signature="t",
1019
@dbus_service_property(_interface, signature=u"t",
1020
access=u"readwrite")
1115
1021
def Timeout_dbus_property(self, value=None):
1116
1022
if value is None: # get
1117
1023
return dbus.UInt64(self.timeout_milliseconds())
1118
old_value = self.timeout
1119
1024
self.timeout = datetime.timedelta(0, 0, 0, value)
1120
1025
# Emit D-Bus signal
1121
if old_value != self.timeout:
1122
self.PropertyChanged(dbus.String("Timeout"),
1123
dbus.UInt64(value, variant_level=1))
1124
if getattr(self, "disable_initiator_tag", None) is None:
1026
self.PropertyChanged(dbus.String(u"Timeout"),
1027
dbus.UInt64(value, variant_level=1))
1028
if getattr(self, u"disable_initiator_tag", None) is None:
1126
1030
# Reschedule timeout
1127
1031
gobject.source_remove(self.disable_initiator_tag)
1128
1032
self.disable_initiator_tag = None
1130
1033
time_to_die = (self.
1131
1034
_timedelta_to_milliseconds((self
1132
1035
.last_checked_ok
1137
1040
# The timeout has passed
1140
self.expires = (datetime.datetime.utcnow()
1141
+ datetime.timedelta(milliseconds = time_to_die))
1142
1043
self.disable_initiator_tag = (gobject.timeout_add
1143
1044
(time_to_die, self.disable))
1145
# ExtendedTimeout - property
1146
@dbus_service_property(_interface, signature="t",
1148
def ExtendedTimeout_dbus_property(self, value=None):
1149
if value is None: # get
1150
return dbus.UInt64(self.extended_timeout_milliseconds())
1151
old_value = self.extended_timeout
1152
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1154
if old_value != self.extended_timeout:
1155
self.PropertyChanged(dbus.String("ExtendedTimeout"),
1156
dbus.UInt64(value, variant_level=1))
1158
1046
# Interval - property
1159
@dbus_service_property(_interface, signature="t",
1047
@dbus_service_property(_interface, signature=u"t",
1048
access=u"readwrite")
1161
1049
def Interval_dbus_property(self, value=None):
1162
1050
if value is None: # get
1163
1051
return dbus.UInt64(self.interval_milliseconds())
1164
old_value = self.interval
1165
1052
self.interval = datetime.timedelta(0, 0, 0, value)
1166
1053
# Emit D-Bus signal
1167
if old_value != self.interval:
1168
self.PropertyChanged(dbus.String("Interval"),
1169
dbus.UInt64(value, variant_level=1))
1170
if getattr(self, "checker_initiator_tag", None) is None:
1054
self.PropertyChanged(dbus.String(u"Interval"),
1055
dbus.UInt64(value, variant_level=1))
1056
if getattr(self, u"checker_initiator_tag", None) is None:
1172
1058
# Reschedule checker run
1173
1059
gobject.source_remove(self.checker_initiator_tag)
1176
1062
self.start_checker() # Start one now, too
1178
1064
# Checker - property
1179
@dbus_service_property(_interface, signature="s",
1065
@dbus_service_property(_interface, signature=u"s",
1066
access=u"readwrite")
1181
1067
def Checker_dbus_property(self, value=None):
1182
1068
if value is None: # get
1183
1069
return dbus.String(self.checker_command)
1184
old_value = self.checker_command
1185
1070
self.checker_command = value
1186
1071
# Emit D-Bus signal
1187
if old_value != self.checker_command:
1188
self.PropertyChanged(dbus.String("Checker"),
1189
dbus.String(self.checker_command,
1072
self.PropertyChanged(dbus.String(u"Checker"),
1073
dbus.String(self.checker_command,
1192
1076
# CheckerRunning - property
1193
@dbus_service_property(_interface, signature="b",
1077
@dbus_service_property(_interface, signature=u"b",
1078
access=u"readwrite")
1195
1079
def CheckerRunning_dbus_property(self, value=None):
1196
1080
if value is None: # get
1197
1081
return dbus.Boolean(self.checker is not None)
1263
1147
# no X.509 keys are added to it. Therefore, we can use it
1264
1148
# here despite using OpenPGP certificates.
1266
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1267
# "+AES-256-CBC", "+SHA1",
1268
# "+COMP-NULL", "+CTYPE-OPENPGP",
1150
#priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
1151
# u"+AES-256-CBC", u"+SHA1",
1152
# u"+COMP-NULL", u"+CTYPE-OPENPGP",
1270
1154
# Use a fallback default, since this MUST be set.
1271
1155
priority = self.server.gnutls_priority
1272
1156
if priority is None:
1157
priority = u"NORMAL"
1274
1158
(gnutls.library.functions
1275
1159
.gnutls_priority_set_direct(session._c_object,
1276
1160
priority, None))
1278
1162
# Start communication using the Mandos protocol
1279
1163
# Get protocol number
1280
1164
line = self.request.makefile().readline()
1281
logger.debug("Protocol version: %r", line)
1165
logger.debug(u"Protocol version: %r", line)
1283
1167
if int(line.strip().split()[0]) > 1:
1284
1168
raise RuntimeError
1285
except (ValueError, IndexError, RuntimeError) as error:
1286
logger.error("Unknown protocol version: %s", error)
1169
except (ValueError, IndexError, RuntimeError), error:
1170
logger.error(u"Unknown protocol version: %s", error)
1289
1173
# Start GnuTLS connection
1291
1175
session.handshake()
1292
except gnutls.errors.GNUTLSError as error:
1293
logger.warning("Handshake failed: %s", error)
1176
except gnutls.errors.GNUTLSError, error:
1177
logger.warning(u"Handshake failed: %s", error)
1294
1178
# Do not run session.bye() here: the session is not
1295
1179
# established. Just abandon the request.
1297
logger.debug("Handshake succeeded")
1181
logger.debug(u"Handshake succeeded")
1299
1183
approval_required = False
1302
1186
fpr = self.fingerprint(self.peer_certificate
1305
gnutls.errors.GNUTLSError) as error:
1306
logger.warning("Bad certificate: %s", error)
1188
except (TypeError, gnutls.errors.GNUTLSError), error:
1189
logger.warning(u"Bad certificate: %s", error)
1308
logger.debug("Fingerprint: %s", fpr)
1191
logger.debug(u"Fingerprint: %s", fpr)
1311
1194
client = ProxyClient(child_pipe, fpr,
1512
1395
bind to an address or port if they were not specified."""
1513
1396
if self.interface is not None:
1514
1397
if SO_BINDTODEVICE is None:
1515
logger.error("SO_BINDTODEVICE does not exist;"
1516
" cannot bind to interface %s",
1398
logger.error(u"SO_BINDTODEVICE does not exist;"
1399
u" cannot bind to interface %s",
1517
1400
self.interface)
1520
1403
self.socket.setsockopt(socket.SOL_SOCKET,
1521
1404
SO_BINDTODEVICE,
1522
1405
str(self.interface
1524
except socket.error as error:
1407
except socket.error, error:
1525
1408
if error[0] == errno.EPERM:
1526
logger.error("No permission to"
1527
" bind to interface %s",
1409
logger.error(u"No permission to"
1410
u" bind to interface %s",
1528
1411
self.interface)
1529
1412
elif error[0] == errno.ENOPROTOOPT:
1530
logger.error("SO_BINDTODEVICE not available;"
1531
" cannot bind to interface %s",
1413
logger.error(u"SO_BINDTODEVICE not available;"
1414
u" cannot bind to interface %s",
1532
1415
self.interface)
1591
1474
def handle_ipc(self, source, condition, parent_pipe=None,
1592
1475
client_object=None):
1593
1476
condition_names = {
1594
gobject.IO_IN: "IN", # There is data to read.
1595
gobject.IO_OUT: "OUT", # Data can be written (without
1477
gobject.IO_IN: u"IN", # There is data to read.
1478
gobject.IO_OUT: u"OUT", # Data can be written (without
1597
gobject.IO_PRI: "PRI", # There is urgent data to read.
1598
gobject.IO_ERR: "ERR", # Error condition.
1599
gobject.IO_HUP: "HUP" # Hung up (the connection has been
1480
gobject.IO_PRI: u"PRI", # There is urgent data to read.
1481
gobject.IO_ERR: u"ERR", # Error condition.
1482
gobject.IO_HUP: u"HUP" # Hung up (the connection has been
1600
1483
# broken, usually for pipes and
1662
1545
def string_to_delta(interval):
1663
1546
"""Parse a string and return a datetime.timedelta
1665
>>> string_to_delta('7d')
1548
>>> string_to_delta(u'7d')
1666
1549
datetime.timedelta(7)
1667
>>> string_to_delta('60s')
1550
>>> string_to_delta(u'60s')
1668
1551
datetime.timedelta(0, 60)
1669
>>> string_to_delta('60m')
1552
>>> string_to_delta(u'60m')
1670
1553
datetime.timedelta(0, 3600)
1671
>>> string_to_delta('24h')
1554
>>> string_to_delta(u'24h')
1672
1555
datetime.timedelta(1)
1673
>>> string_to_delta('1w')
1556
>>> string_to_delta(u'1w')
1674
1557
datetime.timedelta(7)
1675
>>> string_to_delta('5m 30s')
1558
>>> string_to_delta(u'5m 30s')
1676
1559
datetime.timedelta(0, 330)
1678
1561
timevalue = datetime.timedelta(0)
1681
1564
suffix = unicode(s[-1])
1682
1565
value = int(s[:-1])
1684
1567
delta = datetime.timedelta(value)
1568
elif suffix == u"s":
1686
1569
delta = datetime.timedelta(0, value)
1570
elif suffix == u"m":
1688
1571
delta = datetime.timedelta(0, 0, 0, 0, value)
1572
elif suffix == u"h":
1690
1573
delta = datetime.timedelta(0, 0, 0, 0, 0, value)
1574
elif suffix == u"w":
1692
1575
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1694
raise ValueError("Unknown suffix %r" % suffix)
1695
except (ValueError, IndexError) as e:
1696
raise ValueError(*(e.args))
1577
raise ValueError(u"Unknown suffix %r" % suffix)
1578
except (ValueError, IndexError), e:
1579
raise ValueError(e.message)
1697
1580
timevalue += delta
1698
1581
return timevalue
1705
1588
global if_nametoindex
1707
1590
if_nametoindex = (ctypes.cdll.LoadLibrary
1708
(ctypes.util.find_library("c"))
1591
(ctypes.util.find_library(u"c"))
1709
1592
.if_nametoindex)
1710
1593
except (OSError, AttributeError):
1711
logger.warning("Doing if_nametoindex the hard way")
1594
logger.warning(u"Doing if_nametoindex the hard way")
1712
1595
def if_nametoindex(interface):
1713
1596
"Get an interface index the hard way, i.e. using fcntl()"
1714
1597
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
1715
1598
with contextlib.closing(socket.socket()) as s:
1716
1599
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1717
struct.pack(str("16s16x"),
1600
struct.pack(str(u"16s16x"),
1719
interface_index = struct.unpack(str("I"),
1602
interface_index = struct.unpack(str(u"I"),
1720
1603
ifreq[16:20])[0]
1721
1604
return interface_index
1722
1605
return if_nametoindex(interface)
1752
1635
##################################################################
1753
1636
# Parsing of options, both command line and config file
1755
parser = argparse.ArgumentParser()
1756
parser.add_argument("-v", "--version", action="version",
1757
version = "%%(prog)s %s" % version,
1758
help="show version number and exit")
1759
parser.add_argument("-i", "--interface", metavar="IF",
1760
help="Bind to interface IF")
1761
parser.add_argument("-a", "--address",
1762
help="Address to listen for requests on")
1763
parser.add_argument("-p", "--port", type=int,
1764
help="Port number to receive requests on")
1765
parser.add_argument("--check", action="store_true",
1766
help="Run self-test")
1767
parser.add_argument("--debug", action="store_true",
1768
help="Debug mode; run in foreground and log"
1770
parser.add_argument("--debuglevel", metavar="LEVEL",
1771
help="Debug level for stdout output")
1772
parser.add_argument("--priority", help="GnuTLS"
1773
" priority string (see GnuTLS documentation)")
1774
parser.add_argument("--servicename",
1775
metavar="NAME", help="Zeroconf service name")
1776
parser.add_argument("--configdir",
1777
default="/etc/mandos", metavar="DIR",
1778
help="Directory to search for configuration"
1780
parser.add_argument("--no-dbus", action="store_false",
1781
dest="use_dbus", help="Do not provide D-Bus"
1782
" system bus interface")
1783
parser.add_argument("--no-ipv6", action="store_false",
1784
dest="use_ipv6", help="Do not use IPv6")
1785
options = parser.parse_args()
1638
parser = optparse.OptionParser(version = "%%prog %s" % version)
1639
parser.add_option("-i", u"--interface", type=u"string",
1640
metavar="IF", help=u"Bind to interface IF")
1641
parser.add_option("-a", u"--address", type=u"string",
1642
help=u"Address to listen for requests on")
1643
parser.add_option("-p", u"--port", type=u"int",
1644
help=u"Port number to receive requests on")
1645
parser.add_option("--check", action=u"store_true",
1646
help=u"Run self-test")
1647
parser.add_option("--debug", action=u"store_true",
1648
help=u"Debug mode; run in foreground and log to"
1650
parser.add_option("--debuglevel", type=u"string", metavar="Level",
1651
help=u"Debug level for stdout output")
1652
parser.add_option("--priority", type=u"string", help=u"GnuTLS"
1653
u" priority string (see GnuTLS documentation)")
1654
parser.add_option("--servicename", type=u"string",
1655
metavar=u"NAME", help=u"Zeroconf service name")
1656
parser.add_option("--configdir", type=u"string",
1657
default=u"/etc/mandos", metavar=u"DIR",
1658
help=u"Directory to search for configuration"
1660
parser.add_option("--no-dbus", action=u"store_false",
1661
dest=u"use_dbus", help=u"Do not provide D-Bus"
1662
u" system bus interface")
1663
parser.add_option("--no-ipv6", action=u"store_false",
1664
dest=u"use_ipv6", help=u"Do not use IPv6")
1665
options = parser.parse_args()[0]
1787
1667
if options.check:
1792
1672
# Default values for config file for server-global settings
1793
server_defaults = { "interface": "",
1798
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1799
"servicename": "Mandos",
1673
server_defaults = { u"interface": u"",
1678
u"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1679
u"servicename": u"Mandos",
1680
u"use_dbus": u"True",
1681
u"use_ipv6": u"True",
1805
1685
# Parse config file for server-global settings
1806
1686
server_config = configparser.SafeConfigParser(server_defaults)
1807
1687
del server_defaults
1808
1688
server_config.read(os.path.join(options.configdir,
1810
1690
# Convert the SafeConfigParser object to a dict
1811
1691
server_settings = server_config.defaults()
1812
1692
# Use the appropriate methods on the non-string config options
1813
for option in ("debug", "use_dbus", "use_ipv6"):
1814
server_settings[option] = server_config.getboolean("DEFAULT",
1693
for option in (u"debug", u"use_dbus", u"use_ipv6"):
1694
server_settings[option] = server_config.getboolean(u"DEFAULT",
1816
1696
if server_settings["port"]:
1817
server_settings["port"] = server_config.getint("DEFAULT",
1697
server_settings["port"] = server_config.getint(u"DEFAULT",
1819
1699
del server_config
1821
1701
# Override the settings from the config file with command line
1822
1702
# options, if set.
1823
for option in ("interface", "address", "port", "debug",
1824
"priority", "servicename", "configdir",
1825
"use_dbus", "use_ipv6", "debuglevel"):
1703
for option in (u"interface", u"address", u"port", u"debug",
1704
u"priority", u"servicename", u"configdir",
1705
u"use_dbus", u"use_ipv6", u"debuglevel"):
1826
1706
value = getattr(options, option)
1827
1707
if value is not None:
1828
1708
server_settings[option] = value
1836
1716
##################################################################
1838
1718
# For convenience
1839
debug = server_settings["debug"]
1840
debuglevel = server_settings["debuglevel"]
1841
use_dbus = server_settings["use_dbus"]
1842
use_ipv6 = server_settings["use_ipv6"]
1719
debug = server_settings[u"debug"]
1720
debuglevel = server_settings[u"debuglevel"]
1721
use_dbus = server_settings[u"use_dbus"]
1722
use_ipv6 = server_settings[u"use_ipv6"]
1844
if server_settings["servicename"] != "Mandos":
1724
if server_settings[u"servicename"] != u"Mandos":
1845
1725
syslogger.setFormatter(logging.Formatter
1846
('Mandos (%s) [%%(process)d]:'
1847
' %%(levelname)s: %%(message)s'
1848
% server_settings["servicename"]))
1726
(u'Mandos (%s) [%%(process)d]:'
1727
u' %%(levelname)s: %%(message)s'
1728
% server_settings[u"servicename"]))
1850
1730
# Parse config file with clients
1851
client_defaults = { "timeout": "5m",
1852
"extended_timeout": "15m",
1854
"checker": "fping -q -- %%(host)s",
1856
"approval_delay": "0s",
1857
"approval_duration": "1s",
1731
client_defaults = { u"timeout": u"1h",
1733
u"checker": u"fping -q -- %%(host)s",
1735
u"approval_delay": u"0s",
1736
u"approval_duration": u"1s",
1859
1738
client_config = configparser.SafeConfigParser(client_defaults)
1860
client_config.read(os.path.join(server_settings["configdir"],
1739
client_config.read(os.path.join(server_settings[u"configdir"],
1863
1742
global mandos_dbus_service
1864
1743
mandos_dbus_service = None
1866
tcp_server = MandosServer((server_settings["address"],
1867
server_settings["port"]),
1745
tcp_server = MandosServer((server_settings[u"address"],
1746
server_settings[u"port"]),
1869
interface=(server_settings["interface"]
1748
interface=(server_settings[u"interface"]
1871
1750
use_ipv6=use_ipv6,
1872
1751
gnutls_priority=
1873
server_settings["priority"],
1752
server_settings[u"priority"],
1874
1753
use_dbus=use_dbus)
1876
pidfilename = "/var/run/mandos.pid"
1878
pidfile = open(pidfilename, "w")
1880
logger.error("Could not open file %r", pidfilename)
1754
pidfilename = u"/var/run/mandos.pid"
1756
pidfile = open(pidfilename, u"w")
1758
logger.error(u"Could not open file %r", pidfilename)
1883
uid = pwd.getpwnam("_mandos").pw_uid
1884
gid = pwd.getpwnam("_mandos").pw_gid
1761
uid = pwd.getpwnam(u"_mandos").pw_uid
1762
gid = pwd.getpwnam(u"_mandos").pw_gid
1885
1763
except KeyError:
1887
uid = pwd.getpwnam("mandos").pw_uid
1888
gid = pwd.getpwnam("mandos").pw_gid
1765
uid = pwd.getpwnam(u"mandos").pw_uid
1766
gid = pwd.getpwnam(u"mandos").pw_gid
1889
1767
except KeyError:
1891
uid = pwd.getpwnam("nobody").pw_uid
1892
gid = pwd.getpwnam("nobody").pw_gid
1769
uid = pwd.getpwnam(u"nobody").pw_uid
1770
gid = pwd.getpwnam(u"nobody").pw_gid
1893
1771
except KeyError:
1899
except OSError as error:
1777
except OSError, error:
1900
1778
if error[0] != errno.EPERM:
1944
1818
# End of Avahi example code
1947
bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
1821
bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos",
1948
1822
bus, do_not_queue=True)
1949
except dbus.exceptions.NameExistsException as e:
1950
logger.error(unicode(e) + ", disabling D-Bus")
1823
except dbus.exceptions.NameExistsException, e:
1824
logger.error(unicode(e) + u", disabling D-Bus")
1951
1825
use_dbus = False
1952
server_settings["use_dbus"] = False
1826
server_settings[u"use_dbus"] = False
1953
1827
tcp_server.use_dbus = False
1954
1828
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1955
service = AvahiService(name = server_settings["servicename"],
1956
servicetype = "_mandos._tcp",
1829
service = AvahiService(name = server_settings[u"servicename"],
1830
servicetype = u"_mandos._tcp",
1957
1831
protocol = protocol, bus = bus)
1958
1832
if server_settings["interface"]:
1959
1833
service.interface = (if_nametoindex
1960
(str(server_settings["interface"])))
1834
(str(server_settings[u"interface"])))
1837
# Close all input and output, do double fork, etc.
1962
1840
global multiprocessing_manager
1963
1841
multiprocessing_manager = multiprocessing.Manager()
1983
1861
client_config, section)))
1984
1862
for section in client_config.sections()))
1985
1863
if not tcp_server.clients:
1986
logger.warning("No clients defined")
1864
logger.warning(u"No clients defined")
1869
pidfile.write(str(pid) + "\n")
1872
logger.error(u"Could not write to file %r with PID %d",
1875
# "pidfile" was never created
1992
pidfile.write(str(pid) + "\n".encode("utf-8"))
1995
logger.error("Could not write to file %r with PID %d",
1998
# "pidfile" was never created
2002
1880
signal.signal(signal.SIGINT, signal.SIG_IGN)
2004
1881
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2005
1882
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2008
1885
class MandosDBusService(dbus.service.Object):
2009
1886
"""A D-Bus proxy object"""
2010
1887
def __init__(self):
2011
dbus.service.Object.__init__(self, bus, "/")
2012
_interface = "se.bsnet.fukt.Mandos"
1888
dbus.service.Object.__init__(self, bus, u"/")
1889
_interface = u"se.bsnet.fukt.Mandos"
2014
@dbus.service.signal(_interface, signature="o")
1891
@dbus.service.signal(_interface, signature=u"o")
2015
1892
def ClientAdded(self, objpath):
2019
@dbus.service.signal(_interface, signature="ss")
1896
@dbus.service.signal(_interface, signature=u"ss")
2020
1897
def ClientNotFound(self, fingerprint, address):
2024
@dbus.service.signal(_interface, signature="os")
1901
@dbus.service.signal(_interface, signature=u"os")
2025
1902
def ClientRemoved(self, objpath, name):
2029
@dbus.service.method(_interface, out_signature="ao")
1906
@dbus.service.method(_interface, out_signature=u"ao")
2030
1907
def GetAllClients(self):
2032
1909
return dbus.Array(c.dbus_object_path
2033
1910
for c in tcp_server.clients)
2035
1912
@dbus.service.method(_interface,
2036
out_signature="a{oa{sv}}")
1913
out_signature=u"a{oa{sv}}")
2037
1914
def GetAllClientsWithProperties(self):
2039
1916
return dbus.Dictionary(
2040
((c.dbus_object_path, c.GetAll(""))
1917
((c.dbus_object_path, c.GetAll(u""))
2041
1918
for c in tcp_server.clients),
1919
signature=u"oa{sv}")
2044
@dbus.service.method(_interface, in_signature="o")
1921
@dbus.service.method(_interface, in_signature=u"o")
2045
1922
def RemoveClient(self, object_path):
2047
1924
for c in tcp_server.clients: