151
150
self.group = None # our entry group
152
151
self.server = None
154
self.entry_group_state_changed_match = None
155
153
def rename(self):
156
154
"""Derived from the Avahi example code"""
157
155
if self.rename_count >= self.max_renames:
158
logger.critical("No suitable Zeroconf service name found"
159
" after %i retries, exiting.",
156
logger.critical(u"No suitable Zeroconf service name found"
157
u" after %i retries, exiting.",
160
158
self.rename_count)
161
raise AvahiServiceError("Too many renames")
159
raise AvahiServiceError(u"Too many renames")
162
160
self.name = unicode(self.server.GetAlternativeServiceName(self.name))
163
logger.info("Changing Zeroconf service name to %r ...",
161
logger.info(u"Changing Zeroconf service name to %r ...",
165
163
syslogger.setFormatter(logging.Formatter
166
('Mandos (%s) [%%(process)d]:'
167
' %%(levelname)s: %%(message)s'
164
(u'Mandos (%s) [%%(process)d]:'
165
u' %%(levelname)s: %%(message)s'
172
except dbus.exceptions.DBusException as error:
173
logger.critical("DBusException: %s", error)
170
except dbus.exceptions.DBusException, error:
171
logger.critical(u"DBusException: %s", error)
176
174
self.rename_count += 1
177
175
def remove(self):
178
176
"""Derived from the Avahi example code"""
179
if self.entry_group_state_changed_match is not None:
180
self.entry_group_state_changed_match.remove()
181
self.entry_group_state_changed_match = None
182
177
if self.group is not None:
183
178
self.group.Reset()
185
180
"""Derived from the Avahi example code"""
187
181
if self.group is None:
188
182
self.group = dbus.Interface(
189
183
self.bus.get_object(avahi.DBUS_NAME,
190
184
self.server.EntryGroupNew()),
191
185
avahi.DBUS_INTERFACE_ENTRY_GROUP)
192
self.entry_group_state_changed_match = (
193
self.group.connect_to_signal(
194
'StateChanged', self .entry_group_state_changed))
195
logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
186
self.group.connect_to_signal('StateChanged',
188
.entry_group_state_changed)
189
logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
196
190
self.name, self.type)
197
191
self.group.AddService(
205
199
self.group.Commit()
206
200
def entry_group_state_changed(self, state, error):
207
201
"""Derived from the Avahi example code"""
208
logger.debug("Avahi entry group state change: %i", state)
202
logger.debug(u"Avahi entry group state change: %i", state)
210
204
if state == avahi.ENTRY_GROUP_ESTABLISHED:
211
logger.debug("Zeroconf service established.")
205
logger.debug(u"Zeroconf service established.")
212
206
elif state == avahi.ENTRY_GROUP_COLLISION:
213
logger.info("Zeroconf service name collision.")
207
logger.warning(u"Zeroconf service name collision.")
215
209
elif state == avahi.ENTRY_GROUP_FAILURE:
216
logger.critical("Avahi: Error in group state changed %s",
210
logger.critical(u"Avahi: Error in group state changed %s",
218
raise AvahiGroupError("State changed: %s"
212
raise AvahiGroupError(u"State changed: %s"
219
213
% unicode(error))
220
214
def cleanup(self):
221
215
"""Derived from the Avahi example code"""
222
216
if self.group is not None:
225
except (dbus.exceptions.UnknownMethodException,
226
dbus.exceptions.DBusException) as e:
228
218
self.group = None
230
def server_state_changed(self, state, error=None):
219
def server_state_changed(self, state):
231
220
"""Derived from the Avahi example code"""
232
logger.debug("Avahi server state change: %i", state)
233
bad_states = { avahi.SERVER_INVALID:
234
"Zeroconf server invalid",
235
avahi.SERVER_REGISTERING: None,
236
avahi.SERVER_COLLISION:
237
"Zeroconf server name collision",
238
avahi.SERVER_FAILURE:
239
"Zeroconf server failure" }
240
if state in bad_states:
241
if bad_states[state] is not None:
243
logger.error(bad_states[state])
245
logger.error(bad_states[state] + ": %r", error)
221
logger.debug(u"Avahi server state change: %i", state)
222
if state == avahi.SERVER_COLLISION:
223
logger.error(u"Zeroconf server name collision")
247
225
elif state == avahi.SERVER_RUNNING:
251
logger.debug("Unknown state: %r", state)
253
logger.debug("Unknown state: %r: %r", state, error)
254
227
def activate(self):
255
228
"""Derived from the Avahi example code"""
256
229
if self.server is None:
257
230
self.server = dbus.Interface(
258
231
self.bus.get_object(avahi.DBUS_NAME,
259
avahi.DBUS_PATH_SERVER,
260
follow_name_owner_changes=True),
232
avahi.DBUS_PATH_SERVER),
261
233
avahi.DBUS_INTERFACE_SERVER)
262
self.server.connect_to_signal("StateChanged",
234
self.server.connect_to_signal(u"StateChanged",
263
235
self.server_state_changed)
264
236
self.server_state_changed(self.server.GetState())
267
def _timedelta_to_milliseconds(td):
268
"Convert a datetime.timedelta() to milliseconds"
269
return ((td.days * 24 * 60 * 60 * 1000)
270
+ (td.seconds * 1000)
271
+ (td.microseconds // 1000))
273
239
class Client(object):
274
240
"""A representation of a client host served by this server.
277
_approved: bool(); 'None' if not yet approved/disapproved
278
approval_delay: datetime.timedelta(); Time to wait for approval
279
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)
280
257
checker: subprocess.Popen(); a running checker process used
281
258
to see if the client lives.
282
259
'None' if no process is running.
283
checker_callback_tag: a gobject event source tag, or None
284
checker_command: string; External command which is run to check
285
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
286
265
runtime with vars(self) as dict, so that for
287
266
instance %(name)s can be used in the command.
288
checker_initiator_tag: a gobject event source tag, or None
289
created: datetime.datetime(); (UTC) object creation
290
267
current_checker_command: string; current running checker_command
291
disable_hook: If set, called by disable() as disable_hook(self)
292
disable_initiator_tag: a gobject event source tag, or None
294
fingerprint: string (40 or 32 hexadecimal digits); used to
295
uniquely identify the client
296
host: string; available for use by the checker command
297
interval: datetime.timedelta(); How often to start a new checker
298
last_approval_request: datetime.datetime(); (UTC) or None
299
last_checked_ok: datetime.datetime(); (UTC) or None
300
last_enabled: datetime.datetime(); (UTC)
301
name: string; from the config file, used in log messages and
303
secret: bytestring; sent verbatim (over TLS) to client
304
timeout: datetime.timedelta(); How long from last_checked_ok
305
until this client is disabled
306
extended_timeout: extra long timeout when password has been sent
307
runtime_expansions: Allowed attributes for runtime expansion.
308
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
312
runtime_expansions = ("approval_delay", "approval_duration",
313
"created", "enabled", "fingerprint",
314
"host", "interval", "last_checked_ok",
315
"last_enabled", "name", "timeout")
274
def _timedelta_to_milliseconds(td):
275
"Convert a datetime.timedelta() to milliseconds"
276
return ((td.days * 24 * 60 * 60 * 1000)
277
+ (td.seconds * 1000)
278
+ (td.microseconds // 1000))
317
280
def timeout_milliseconds(self):
318
281
"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)
282
return self._timedelta_to_milliseconds(self.timeout)
325
284
def interval_milliseconds(self):
326
285
"Return the 'interval' attribute in milliseconds"
327
return _timedelta_to_milliseconds(self.interval)
286
return self._timedelta_to_milliseconds(self.interval)
329
288
def approval_delay_milliseconds(self):
330
return _timedelta_to_milliseconds(self.approval_delay)
289
return self._timedelta_to_milliseconds(self.approval_delay)
332
291
def __init__(self, name = None, disable_hook=None, config=None):
333
292
"""Note: the 'checker' key in 'config' sets the
337
296
if config is None:
339
logger.debug("Creating client %r", self.name)
298
logger.debug(u"Creating client %r", self.name)
340
299
# Uppercase and remove spaces from fingerprint for later
341
300
# 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:
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:
349
308
with open(os.path.expanduser(os.path.expandvars
350
(config["secfile"])),
309
(config[u"secfile"])),
351
310
"rb") as secfile:
352
311
self.secret = secfile.read()
354
raise TypeError("No secret or secfile for client %s"
313
raise TypeError(u"No secret or secfile for client %s"
356
self.host = config.get("host", "")
315
self.host = config.get(u"host", u"")
357
316
self.created = datetime.datetime.utcnow()
358
317
self.enabled = False
359
self.last_approval_request = None
360
318
self.last_enabled = None
361
319
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"])
320
self.timeout = string_to_delta(config[u"timeout"])
321
self.interval = string_to_delta(config[u"interval"])
365
322
self.disable_hook = disable_hook
366
323
self.checker = None
367
324
self.checker_initiator_tag = None
368
325
self.disable_initiator_tag = None
370
326
self.checker_callback_tag = None
371
self.checker_command = config["checker"]
327
self.checker_command = config[u"checker"]
372
328
self.current_checker_command = None
373
329
self.last_connect = None
374
330
self._approved = None
375
self.approved_by_default = config.get("approved_by_default",
331
self.approved_by_default = config.get(u"approved_by_default",
377
333
self.approvals_pending = 0
378
334
self.approval_delay = string_to_delta(
379
config["approval_delay"])
335
config[u"approval_delay"])
380
336
self.approval_duration = string_to_delta(
381
config["approval_duration"])
337
config[u"approval_duration"])
382
338
self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
384
340
def send_changedstate(self):
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
687
632
Note: Will not include properties with access="write".
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",
754
def datetime_to_dbus (dt, variant_level=0):
755
"""Convert a UTC datetime.datetime() to a D-Bus type."""
757
return dbus.String("", variant_level = variant_level)
758
return dbus.String(dt.isoformat(),
759
variant_level=variant_level)
762
699
class ClientDBus(Client, DBusObjectWithProperties):
763
700
"""A Client class using D-Bus
778
711
Client.__init__(self, *args, **kwargs)
779
712
# Only now, when this client is initialized, can it show up on
781
client_object_name = unicode(self.name).translate(
784
714
self.dbus_object_path = (dbus.ObjectPath
785
("/clients/" + client_object_name))
716
+ self.name.replace(u".", u"_")))
786
717
DBusObjectWithProperties.__init__(self, self.bus,
787
718
self.dbus_object_path)
789
def notifychangeproperty(transform_func,
790
dbus_name, type_func=lambda x: x,
792
""" Modify a variable so that its a property that announce its
794
transform_fun: Function that takes a value and transform it to
796
dbus_name: DBus name of the variable
797
type_func: Function that transform the value before sending it
799
variant_level: DBus variant level. default: 1
802
def setter(self, value):
803
old_value = real_value[0]
804
real_value[0] = value
805
if hasattr(self, "dbus_object_path"):
806
if type_func(old_value) != type_func(real_value[0]):
807
dbus_value = transform_func(type_func(real_value[0]),
809
self.PropertyChanged(dbus.String(dbus_name),
812
return property(lambda self: real_value[0], setter)
815
expires = notifychangeproperty(datetime_to_dbus, "Expires")
816
approvals_pending = notifychangeproperty(dbus.Boolean,
819
enabled = notifychangeproperty(dbus.Boolean, "Enabled")
820
last_enabled = notifychangeproperty(datetime_to_dbus,
822
checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
823
type_func = lambda checker: checker is not None)
824
last_checked_ok = notifychangeproperty(datetime_to_dbus,
826
last_approval_request = notifychangeproperty(datetime_to_dbus,
827
"LastApprovalRequest")
828
approved_by_default = notifychangeproperty(dbus.Boolean,
830
approval_delay = notifychangeproperty(dbus.UInt16, "ApprovalDelay",
831
type_func = _timedelta_to_milliseconds)
832
approval_duration = notifychangeproperty(dbus.UInt16, "ApprovalDuration",
833
type_func = _timedelta_to_milliseconds)
834
host = notifychangeproperty(dbus.String, "Host")
835
timeout = notifychangeproperty(dbus.UInt16, "Timeout",
836
type_func = _timedelta_to_milliseconds)
837
extended_timeout = notifychangeproperty(dbus.UInt16, "ExtendedTimeout",
838
type_func = _timedelta_to_milliseconds)
839
interval = notifychangeproperty(dbus.UInt16, "Interval",
840
type_func = _timedelta_to_milliseconds)
841
checker_command = notifychangeproperty(dbus.String, "Checker")
843
del notifychangeproperty
720
def _get_approvals_pending(self):
721
return self._approvals_pending
722
def _set_approvals_pending(self, value):
723
old_value = self._approvals_pending
724
self._approvals_pending = value
726
if (hasattr(self, "dbus_object_path")
727
and bval is not bool(old_value)):
728
dbus_bool = dbus.Boolean(bval, variant_level=1)
729
self.PropertyChanged(dbus.String(u"ApprovalPending"),
732
approvals_pending = property(_get_approvals_pending,
733
_set_approvals_pending)
734
del _get_approvals_pending, _set_approvals_pending
737
def _datetime_to_dbus(dt, variant_level=0):
738
"""Convert a UTC datetime.datetime() to a D-Bus type."""
739
return dbus.String(dt.isoformat(),
740
variant_level=variant_level)
743
oldstate = getattr(self, u"enabled", False)
744
r = Client.enable(self)
745
if oldstate != self.enabled:
747
self.PropertyChanged(dbus.String(u"Enabled"),
748
dbus.Boolean(True, variant_level=1))
749
self.PropertyChanged(
750
dbus.String(u"LastEnabled"),
751
self._datetime_to_dbus(self.last_enabled,
755
def disable(self, quiet = False):
756
oldstate = getattr(self, u"enabled", False)
757
r = Client.disable(self, quiet=quiet)
758
if not quiet and oldstate != self.enabled:
760
self.PropertyChanged(dbus.String(u"Enabled"),
761
dbus.Boolean(False, variant_level=1))
845
764
def __del__(self, *args, **kwargs):
847
766
self.remove_from_connection()
848
767
except LookupError:
850
if hasattr(DBusObjectWithProperties, "__del__"):
769
if hasattr(DBusObjectWithProperties, u"__del__"):
851
770
DBusObjectWithProperties.__del__(self, *args, **kwargs)
852
771
Client.__del__(self, *args, **kwargs)
980
923
# ApprovalPending - property
981
@dbus_service_property(_interface, signature="b", access="read")
924
@dbus_service_property(_interface, signature=u"b", access=u"read")
982
925
def ApprovalPending_dbus_property(self):
983
926
return dbus.Boolean(bool(self.approvals_pending))
985
928
# ApprovedByDefault - property
986
@dbus_service_property(_interface, signature="b",
929
@dbus_service_property(_interface, signature=u"b",
988
931
def ApprovedByDefault_dbus_property(self, value=None):
989
932
if value is None: # get
990
933
return dbus.Boolean(self.approved_by_default)
991
934
self.approved_by_default = bool(value)
936
self.PropertyChanged(dbus.String(u"ApprovedByDefault"),
937
dbus.Boolean(value, variant_level=1))
993
939
# ApprovalDelay - property
994
@dbus_service_property(_interface, signature="t",
940
@dbus_service_property(_interface, signature=u"t",
996
942
def ApprovalDelay_dbus_property(self, value=None):
997
943
if value is None: # get
998
944
return dbus.UInt64(self.approval_delay_milliseconds())
999
945
self.approval_delay = datetime.timedelta(0, 0, 0, value)
947
self.PropertyChanged(dbus.String(u"ApprovalDelay"),
948
dbus.UInt64(value, variant_level=1))
1001
950
# ApprovalDuration - property
1002
@dbus_service_property(_interface, signature="t",
951
@dbus_service_property(_interface, signature=u"t",
1004
953
def ApprovalDuration_dbus_property(self, value=None):
1005
954
if value is None: # get
1006
return dbus.UInt64(_timedelta_to_milliseconds(
955
return dbus.UInt64(self._timedelta_to_milliseconds(
1007
956
self.approval_duration))
1008
957
self.approval_duration = datetime.timedelta(0, 0, 0, value)
959
self.PropertyChanged(dbus.String(u"ApprovalDuration"),
960
dbus.UInt64(value, variant_level=1))
1010
962
# Name - property
1011
@dbus_service_property(_interface, signature="s", access="read")
963
@dbus_service_property(_interface, signature=u"s", access=u"read")
1012
964
def Name_dbus_property(self):
1013
965
return dbus.String(self.name)
1015
967
# Fingerprint - property
1016
@dbus_service_property(_interface, signature="s", access="read")
968
@dbus_service_property(_interface, signature=u"s", access=u"read")
1017
969
def Fingerprint_dbus_property(self):
1018
970
return dbus.String(self.fingerprint)
1020
972
# Host - property
1021
@dbus_service_property(_interface, signature="s",
973
@dbus_service_property(_interface, signature=u"s",
1023
975
def Host_dbus_property(self, value=None):
1024
976
if value is None: # get
1025
977
return dbus.String(self.host)
1026
978
self.host = value
980
self.PropertyChanged(dbus.String(u"Host"),
981
dbus.String(value, variant_level=1))
1028
983
# Created - property
1029
@dbus_service_property(_interface, signature="s", access="read")
984
@dbus_service_property(_interface, signature=u"s", access=u"read")
1030
985
def Created_dbus_property(self):
1031
return dbus.String(datetime_to_dbus(self.created))
986
return dbus.String(self._datetime_to_dbus(self.created))
1033
988
# LastEnabled - property
1034
@dbus_service_property(_interface, signature="s", access="read")
989
@dbus_service_property(_interface, signature=u"s", access=u"read")
1035
990
def LastEnabled_dbus_property(self):
1036
return 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))
1038
995
# Enabled - property
1039
@dbus_service_property(_interface, signature="b",
996
@dbus_service_property(_interface, signature=u"b",
1041
998
def Enabled_dbus_property(self, value=None):
1042
999
if value is None: # get
1043
1000
return dbus.Boolean(self.enabled)
1049
1006
# LastCheckedOK - property
1050
@dbus_service_property(_interface, signature="s",
1007
@dbus_service_property(_interface, signature=u"s",
1008
access=u"readwrite")
1052
1009
def LastCheckedOK_dbus_property(self, value=None):
1053
1010
if value is not None:
1054
1011
self.checked_ok()
1056
return datetime_to_dbus(self.last_checked_ok)
1058
# Expires - property
1059
@dbus_service_property(_interface, signature="s", access="read")
1060
def Expires_dbus_property(self):
1061
return datetime_to_dbus(self.expires)
1063
# LastApprovalRequest - property
1064
@dbus_service_property(_interface, signature="s", access="read")
1065
def LastApprovalRequest_dbus_property(self):
1066
return 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
1068
1018
# Timeout - property
1069
@dbus_service_property(_interface, signature="t",
1019
@dbus_service_property(_interface, signature=u"t",
1020
access=u"readwrite")
1071
1021
def Timeout_dbus_property(self, value=None):
1072
1022
if value is None: # get
1073
1023
return dbus.UInt64(self.timeout_milliseconds())
1074
1024
self.timeout = datetime.timedelta(0, 0, 0, value)
1075
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:
1077
1030
# Reschedule timeout
1078
1031
gobject.source_remove(self.disable_initiator_tag)
1079
1032
self.disable_initiator_tag = None
1081
1033
time_to_die = (self.
1082
1034
_timedelta_to_milliseconds((self
1083
1035
.last_checked_ok
1088
1040
# The timeout has passed
1091
self.expires = (datetime.datetime.utcnow()
1092
+ datetime.timedelta(milliseconds = time_to_die))
1093
1043
self.disable_initiator_tag = (gobject.timeout_add
1094
1044
(time_to_die, self.disable))
1096
# ExtendedTimeout - property
1097
@dbus_service_property(_interface, signature="t",
1099
def ExtendedTimeout_dbus_property(self, value=None):
1100
if value is None: # get
1101
return dbus.UInt64(self.extended_timeout_milliseconds())
1102
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1104
1046
# Interval - property
1105
@dbus_service_property(_interface, signature="t",
1047
@dbus_service_property(_interface, signature=u"t",
1048
access=u"readwrite")
1107
1049
def Interval_dbus_property(self, value=None):
1108
1050
if value is None: # get
1109
1051
return dbus.UInt64(self.interval_milliseconds())
1110
1052
self.interval = datetime.timedelta(0, 0, 0, value)
1111
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:
1113
1058
# Reschedule checker run
1114
1059
gobject.source_remove(self.checker_initiator_tag)
1115
1060
self.checker_initiator_tag = (gobject.timeout_add
1116
1061
(value, self.start_checker))
1117
1062
self.start_checker() # Start one now, too
1119
1064
# Checker - property
1120
@dbus_service_property(_interface, signature="s",
1065
@dbus_service_property(_interface, signature=u"s",
1066
access=u"readwrite")
1122
1067
def Checker_dbus_property(self, value=None):
1123
1068
if value is None: # get
1124
1069
return dbus.String(self.checker_command)
1125
1070
self.checker_command = value
1072
self.PropertyChanged(dbus.String(u"Checker"),
1073
dbus.String(self.checker_command,
1127
1076
# CheckerRunning - property
1128
@dbus_service_property(_interface, signature="b",
1077
@dbus_service_property(_interface, signature=u"b",
1078
access=u"readwrite")
1130
1079
def CheckerRunning_dbus_property(self, value=None):
1131
1080
if value is None: # get
1132
1081
return dbus.Boolean(self.checker is not None)
1184
1133
def handle(self):
1185
1134
with contextlib.closing(self.server.child_pipe) as child_pipe:
1186
logger.info("TCP connection from: %s",
1135
logger.info(u"TCP connection from: %s",
1187
1136
unicode(self.client_address))
1188
logger.debug("Pipe FD: %d",
1137
logger.debug(u"Pipe FD: %d",
1189
1138
self.server.child_pipe.fileno())
1191
1140
session = (gnutls.connection
1192
1141
.ClientSession(self.request,
1193
1142
gnutls.connection
1194
1143
.X509Credentials()))
1196
1145
# Note: gnutls.connection.X509Credentials is really a
1197
1146
# generic GnuTLS certificate credentials object so long as
1198
1147
# no X.509 keys are added to it. Therefore, we can use it
1199
1148
# here despite using OpenPGP certificates.
1201
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1202
# "+AES-256-CBC", "+SHA1",
1203
# "+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",
1205
1154
# Use a fallback default, since this MUST be set.
1206
1155
priority = self.server.gnutls_priority
1207
1156
if priority is None:
1157
priority = u"NORMAL"
1209
1158
(gnutls.library.functions
1210
1159
.gnutls_priority_set_direct(session._c_object,
1211
1160
priority, None))
1213
1162
# Start communication using the Mandos protocol
1214
1163
# Get protocol number
1215
1164
line = self.request.makefile().readline()
1216
logger.debug("Protocol version: %r", line)
1165
logger.debug(u"Protocol version: %r", line)
1218
1167
if int(line.strip().split()[0]) > 1:
1219
1168
raise RuntimeError
1220
except (ValueError, IndexError, RuntimeError) as error:
1221
logger.error("Unknown protocol version: %s", error)
1169
except (ValueError, IndexError, RuntimeError), error:
1170
logger.error(u"Unknown protocol version: %s", error)
1224
1173
# Start GnuTLS connection
1226
1175
session.handshake()
1227
except gnutls.errors.GNUTLSError as error:
1228
logger.warning("Handshake failed: %s", error)
1176
except gnutls.errors.GNUTLSError, error:
1177
logger.warning(u"Handshake failed: %s", error)
1229
1178
# Do not run session.bye() here: the session is not
1230
1179
# established. Just abandon the request.
1232
logger.debug("Handshake succeeded")
1181
logger.debug(u"Handshake succeeded")
1234
1183
approval_required = False
1237
1186
fpr = self.fingerprint(self.peer_certificate
1240
gnutls.errors.GNUTLSError) as error:
1241
logger.warning("Bad certificate: %s", error)
1188
except (TypeError, gnutls.errors.GNUTLSError), error:
1189
logger.warning(u"Bad certificate: %s", error)
1243
logger.debug("Fingerprint: %s", fpr)
1191
logger.debug(u"Fingerprint: %s", fpr)
1246
1194
client = ProxyClient(child_pipe, fpr,
1247
1195
self.client_address)
1689
1639
##################################################################
1690
1640
# Parsing of options, both command line and config file
1692
parser = argparse.ArgumentParser()
1693
parser.add_argument("-v", "--version", action="version",
1694
version = "%%(prog)s %s" % version,
1695
help="show version number and exit")
1696
parser.add_argument("-i", "--interface", metavar="IF",
1697
help="Bind to interface IF")
1698
parser.add_argument("-a", "--address",
1699
help="Address to listen for requests on")
1700
parser.add_argument("-p", "--port", type=int,
1701
help="Port number to receive requests on")
1702
parser.add_argument("--check", action="store_true",
1703
help="Run self-test")
1704
parser.add_argument("--debug", action="store_true",
1705
help="Debug mode; run in foreground and log"
1707
parser.add_argument("--debuglevel", metavar="LEVEL",
1708
help="Debug level for stdout output")
1709
parser.add_argument("--priority", help="GnuTLS"
1710
" priority string (see GnuTLS documentation)")
1711
parser.add_argument("--servicename",
1712
metavar="NAME", help="Zeroconf service name")
1713
parser.add_argument("--configdir",
1714
default="/etc/mandos", metavar="DIR",
1715
help="Directory to search for configuration"
1717
parser.add_argument("--no-dbus", action="store_false",
1718
dest="use_dbus", help="Do not provide D-Bus"
1719
" system bus interface")
1720
parser.add_argument("--no-ipv6", action="store_false",
1721
dest="use_ipv6", help="Do not use IPv6")
1722
options = parser.parse_args()
1642
parser = optparse.OptionParser(version = "%%prog %s" % version)
1643
parser.add_option("-i", u"--interface", type=u"string",
1644
metavar="IF", help=u"Bind to interface IF")
1645
parser.add_option("-a", u"--address", type=u"string",
1646
help=u"Address to listen for requests on")
1647
parser.add_option("-p", u"--port", type=u"int",
1648
help=u"Port number to receive requests on")
1649
parser.add_option("--check", action=u"store_true",
1650
help=u"Run self-test")
1651
parser.add_option("--debug", action=u"store_true",
1652
help=u"Debug mode; run in foreground and log to"
1654
parser.add_option("--debuglevel", type=u"string", metavar="Level",
1655
help=u"Debug level for stdout output")
1656
parser.add_option("--priority", type=u"string", help=u"GnuTLS"
1657
u" priority string (see GnuTLS documentation)")
1658
parser.add_option("--servicename", type=u"string",
1659
metavar=u"NAME", help=u"Zeroconf service name")
1660
parser.add_option("--configdir", type=u"string",
1661
default=u"/etc/mandos", metavar=u"DIR",
1662
help=u"Directory to search for configuration"
1664
parser.add_option("--no-dbus", action=u"store_false",
1665
dest=u"use_dbus", help=u"Do not provide D-Bus"
1666
u" system bus interface")
1667
parser.add_option("--no-ipv6", action=u"store_false",
1668
dest=u"use_ipv6", help=u"Do not use IPv6")
1669
options = parser.parse_args()[0]
1724
1671
if options.check:
1729
1676
# Default values for config file for server-global settings
1730
server_defaults = { "interface": "",
1735
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1736
"servicename": "Mandos",
1677
server_defaults = { u"interface": u"",
1682
u"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1683
u"servicename": u"Mandos",
1684
u"use_dbus": u"True",
1685
u"use_ipv6": u"True",
1742
1689
# Parse config file for server-global settings
1743
1690
server_config = configparser.SafeConfigParser(server_defaults)
1744
1691
del server_defaults
1745
1692
server_config.read(os.path.join(options.configdir,
1747
1694
# Convert the SafeConfigParser object to a dict
1748
1695
server_settings = server_config.defaults()
1749
1696
# Use the appropriate methods on the non-string config options
1750
for option in ("debug", "use_dbus", "use_ipv6"):
1751
server_settings[option] = server_config.getboolean("DEFAULT",
1697
for option in (u"debug", u"use_dbus", u"use_ipv6"):
1698
server_settings[option] = server_config.getboolean(u"DEFAULT",
1753
1700
if server_settings["port"]:
1754
server_settings["port"] = server_config.getint("DEFAULT",
1701
server_settings["port"] = server_config.getint(u"DEFAULT",
1756
1703
del server_config
1758
1705
# Override the settings from the config file with command line
1759
1706
# options, if set.
1760
for option in ("interface", "address", "port", "debug",
1761
"priority", "servicename", "configdir",
1762
"use_dbus", "use_ipv6", "debuglevel"):
1707
for option in (u"interface", u"address", u"port", u"debug",
1708
u"priority", u"servicename", u"configdir",
1709
u"use_dbus", u"use_ipv6", u"debuglevel"):
1763
1710
value = getattr(options, option)
1764
1711
if value is not None:
1765
1712
server_settings[option] = value
1773
1720
##################################################################
1775
1722
# For convenience
1776
debug = server_settings["debug"]
1777
debuglevel = server_settings["debuglevel"]
1778
use_dbus = server_settings["use_dbus"]
1779
use_ipv6 = server_settings["use_ipv6"]
1781
if server_settings["servicename"] != "Mandos":
1723
debug = server_settings[u"debug"]
1724
debuglevel = server_settings[u"debuglevel"]
1725
use_dbus = server_settings[u"use_dbus"]
1726
use_ipv6 = server_settings[u"use_ipv6"]
1728
if server_settings[u"servicename"] != u"Mandos":
1782
1729
syslogger.setFormatter(logging.Formatter
1783
('Mandos (%s) [%%(process)d]:'
1784
' %%(levelname)s: %%(message)s'
1785
% server_settings["servicename"]))
1730
(u'Mandos (%s) [%%(process)d]:'
1731
u' %%(levelname)s: %%(message)s'
1732
% server_settings[u"servicename"]))
1787
1734
# Parse config file with clients
1788
client_defaults = { "timeout": "5m",
1789
"extended_timeout": "15m",
1791
"checker": "fping -q -- %%(host)s",
1793
"approval_delay": "0s",
1794
"approval_duration": "1s",
1735
client_defaults = { u"timeout": u"1h",
1737
u"checker": u"fping -q -- %%(host)s",
1739
u"approval_delay": u"0s",
1740
u"approval_duration": u"1s",
1796
1742
client_config = configparser.SafeConfigParser(client_defaults)
1797
client_config.read(os.path.join(server_settings["configdir"],
1743
client_config.read(os.path.join(server_settings[u"configdir"],
1800
1746
global mandos_dbus_service
1801
1747
mandos_dbus_service = None
1803
tcp_server = MandosServer((server_settings["address"],
1804
server_settings["port"]),
1749
tcp_server = MandosServer((server_settings[u"address"],
1750
server_settings[u"port"]),
1806
interface=(server_settings["interface"]
1752
interface=(server_settings[u"interface"]
1808
1754
use_ipv6=use_ipv6,
1809
1755
gnutls_priority=
1810
server_settings["priority"],
1756
server_settings[u"priority"],
1811
1757
use_dbus=use_dbus)
1813
pidfilename = "/var/run/mandos.pid"
1815
pidfile = open(pidfilename, "w")
1817
logger.error("Could not open file %r", pidfilename)
1758
pidfilename = u"/var/run/mandos.pid"
1760
pidfile = open(pidfilename, u"w")
1762
logger.error(u"Could not open file %r", pidfilename)
1820
uid = pwd.getpwnam("_mandos").pw_uid
1821
gid = pwd.getpwnam("_mandos").pw_gid
1765
uid = pwd.getpwnam(u"_mandos").pw_uid
1766
gid = pwd.getpwnam(u"_mandos").pw_gid
1822
1767
except KeyError:
1824
uid = pwd.getpwnam("mandos").pw_uid
1825
gid = pwd.getpwnam("mandos").pw_gid
1769
uid = pwd.getpwnam(u"mandos").pw_uid
1770
gid = pwd.getpwnam(u"mandos").pw_gid
1826
1771
except KeyError:
1828
uid = pwd.getpwnam("nobody").pw_uid
1829
gid = pwd.getpwnam("nobody").pw_gid
1773
uid = pwd.getpwnam(u"nobody").pw_uid
1774
gid = pwd.getpwnam(u"nobody").pw_gid
1830
1775
except KeyError:
1836
except OSError as error:
1781
except OSError, error:
1837
1782
if error[0] != errno.EPERM:
1881
1822
# End of Avahi example code
1884
bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
1825
bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos",
1885
1826
bus, do_not_queue=True)
1886
except dbus.exceptions.NameExistsException as e:
1887
logger.error(unicode(e) + ", disabling D-Bus")
1827
except dbus.exceptions.NameExistsException, e:
1828
logger.error(unicode(e) + u", disabling D-Bus")
1888
1829
use_dbus = False
1889
server_settings["use_dbus"] = False
1830
server_settings[u"use_dbus"] = False
1890
1831
tcp_server.use_dbus = False
1891
1832
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1892
service = AvahiService(name = server_settings["servicename"],
1893
servicetype = "_mandos._tcp",
1833
service = AvahiService(name = server_settings[u"servicename"],
1834
servicetype = u"_mandos._tcp",
1894
1835
protocol = protocol, bus = bus)
1895
1836
if server_settings["interface"]:
1896
1837
service.interface = (if_nametoindex
1897
(str(server_settings["interface"])))
1838
(str(server_settings[u"interface"])))
1841
# Close all input and output, do double fork, etc.
1899
1844
global multiprocessing_manager
1900
1845
multiprocessing_manager = multiprocessing.Manager()
1945
1889
class MandosDBusService(dbus.service.Object):
1946
1890
"""A D-Bus proxy object"""
1947
1891
def __init__(self):
1948
dbus.service.Object.__init__(self, bus, "/")
1949
_interface = "se.bsnet.fukt.Mandos"
1892
dbus.service.Object.__init__(self, bus, u"/")
1893
_interface = u"se.bsnet.fukt.Mandos"
1951
@dbus.service.signal(_interface, signature="o")
1895
@dbus.service.signal(_interface, signature=u"o")
1952
1896
def ClientAdded(self, objpath):
1956
@dbus.service.signal(_interface, signature="ss")
1900
@dbus.service.signal(_interface, signature=u"ss")
1957
1901
def ClientNotFound(self, fingerprint, address):
1961
@dbus.service.signal(_interface, signature="os")
1905
@dbus.service.signal(_interface, signature=u"os")
1962
1906
def ClientRemoved(self, objpath, name):
1966
@dbus.service.method(_interface, out_signature="ao")
1910
@dbus.service.method(_interface, out_signature=u"ao")
1967
1911
def GetAllClients(self):
1969
1913
return dbus.Array(c.dbus_object_path
1970
1914
for c in tcp_server.clients)
1972
1916
@dbus.service.method(_interface,
1973
out_signature="a{oa{sv}}")
1917
out_signature=u"a{oa{sv}}")
1974
1918
def GetAllClientsWithProperties(self):
1976
1920
return dbus.Dictionary(
1977
((c.dbus_object_path, c.GetAll(""))
1921
((c.dbus_object_path, c.GetAll(u""))
1978
1922
for c in tcp_server.clients),
1923
signature=u"oa{sv}")
1981
@dbus.service.method(_interface, in_signature="o")
1925
@dbus.service.method(_interface, in_signature=u"o")
1982
1926
def RemoveClient(self, object_path):
1984
1928
for c in tcp_server.clients: