150
151
self.group = None # our entry group
151
152
self.server = None
154
self.entry_group_state_changed_match = None
153
155
def rename(self):
154
156
"""Derived from the Avahi example code"""
155
157
if self.rename_count >= self.max_renames:
156
logger.critical(u"No suitable Zeroconf service name found"
157
u" after %i retries, exiting.",
158
logger.critical("No suitable Zeroconf service name found"
159
" after %i retries, exiting.",
158
160
self.rename_count)
159
raise AvahiServiceError(u"Too many renames")
161
raise AvahiServiceError("Too many renames")
160
162
self.name = unicode(self.server.GetAlternativeServiceName(self.name))
161
logger.info(u"Changing Zeroconf service name to %r ...",
163
logger.info("Changing Zeroconf service name to %r ...",
163
165
syslogger.setFormatter(logging.Formatter
164
(u'Mandos (%s) [%%(process)d]:'
165
u' %%(levelname)s: %%(message)s'
166
('Mandos (%s) [%%(process)d]:'
167
' %%(levelname)s: %%(message)s'
172
except dbus.exceptions.DBusException as error:
173
logger.critical("DBusException: %s", error)
169
176
self.rename_count += 1
170
177
def remove(self):
171
178
"""Derived from the Avahi example code"""
179
if self.entry_group_state_changed_match is not None:
180
self.entry_group_state_changed_match.remove()
181
self.entry_group_state_changed_match = None
172
182
if self.group is not None:
173
183
self.group.Reset()
175
185
"""Derived from the Avahi example code"""
176
187
if self.group is None:
177
188
self.group = dbus.Interface(
178
189
self.bus.get_object(avahi.DBUS_NAME,
179
190
self.server.EntryGroupNew()),
180
191
avahi.DBUS_INTERFACE_ENTRY_GROUP)
181
self.group.connect_to_signal('StateChanged',
183
.entry_group_state_changed)
184
logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
192
self.entry_group_state_changed_match = (
193
self.group.connect_to_signal(
194
'StateChanged', self .entry_group_state_changed))
195
logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
185
196
self.name, self.type)
186
197
self.group.AddService(
194
205
self.group.Commit()
195
206
def entry_group_state_changed(self, state, error):
196
207
"""Derived from the Avahi example code"""
197
logger.debug(u"Avahi state change: %i", state)
208
logger.debug("Avahi entry group state change: %i", state)
199
210
if state == avahi.ENTRY_GROUP_ESTABLISHED:
200
logger.debug(u"Zeroconf service established.")
211
logger.debug("Zeroconf service established.")
201
212
elif state == avahi.ENTRY_GROUP_COLLISION:
202
logger.warning(u"Zeroconf service name collision.")
213
logger.info("Zeroconf service name collision.")
204
215
elif state == avahi.ENTRY_GROUP_FAILURE:
205
logger.critical(u"Avahi: Error in group state changed %s",
216
logger.critical("Avahi: Error in group state changed %s",
207
raise AvahiGroupError(u"State changed: %s"
218
raise AvahiGroupError("State changed: %s"
208
219
% unicode(error))
209
220
def cleanup(self):
210
221
"""Derived from the Avahi example code"""
211
222
if self.group is not None:
225
except (dbus.exceptions.UnknownMethodException,
226
dbus.exceptions.DBusException) as e:
213
228
self.group = None
214
def server_state_changed(self, state):
230
def server_state_changed(self, state, error=None):
215
231
"""Derived from the Avahi example code"""
216
if state == avahi.SERVER_COLLISION:
217
logger.error(u"Zeroconf server name collision")
232
logger.debug("Avahi server state change: %i", state)
233
bad_states = { avahi.SERVER_INVALID:
234
"Zeroconf server invalid",
235
avahi.SERVER_REGISTERING: None,
236
avahi.SERVER_COLLISION:
237
"Zeroconf server name collision",
238
avahi.SERVER_FAILURE:
239
"Zeroconf server failure" }
240
if state in bad_states:
241
if bad_states[state] is not None:
243
logger.error(bad_states[state])
245
logger.error(bad_states[state] + ": %r", error)
219
247
elif state == avahi.SERVER_RUNNING:
251
logger.debug("Unknown state: %r", state)
253
logger.debug("Unknown state: %r: %r", state, error)
221
254
def activate(self):
222
255
"""Derived from the Avahi example code"""
223
256
if self.server is None:
224
257
self.server = dbus.Interface(
225
258
self.bus.get_object(avahi.DBUS_NAME,
226
avahi.DBUS_PATH_SERVER),
259
avahi.DBUS_PATH_SERVER,
260
follow_name_owner_changes=True),
227
261
avahi.DBUS_INTERFACE_SERVER)
228
self.server.connect_to_signal(u"StateChanged",
262
self.server.connect_to_signal("StateChanged",
229
263
self.server_state_changed)
230
264
self.server_state_changed(self.server.GetState())
267
def _timedelta_to_milliseconds(td):
268
"Convert a datetime.timedelta() to milliseconds"
269
return ((td.days * 24 * 60 * 60 * 1000)
270
+ (td.seconds * 1000)
271
+ (td.microseconds // 1000))
233
273
class Client(object):
234
274
"""A representation of a client host served by this server.
237
name: string; from the config file, used in log messages and
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
280
checker: subprocess.Popen(); a running checker process used
281
to see if the client lives.
282
'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
286
runtime with vars(self) as dict, so that for
287
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
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
239
294
fingerprint: string (40 or 32 hexadecimal digits); used to
240
295
uniquely identify the client
241
secret: bytestring; sent verbatim (over TLS) to client
242
296
host: string; available for use by the checker command
243
created: datetime.datetime(); (UTC) object creation
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
244
300
last_enabled: datetime.datetime(); (UTC)
246
last_checked_ok: datetime.datetime(); (UTC) or None
301
name: string; from the config file, used in log messages and
303
secret: bytestring; sent verbatim (over TLS) to client
247
304
timeout: datetime.timedelta(); How long from last_checked_ok
248
305
until this client is disabled
249
interval: datetime.timedelta(); How often to start a new checker
250
disable_hook: If set, called by disable() as disable_hook(self)
251
checker: subprocess.Popen(); a running checker process used
252
to see if the client lives.
253
'None' if no process is running.
254
checker_initiator_tag: a gobject event source tag, or None
255
disable_initiator_tag: - '' -
256
checker_callback_tag: - '' -
257
checker_command: string; External command which is run to check if
258
client lives. %() expansions are done at
259
runtime with vars(self) as dict, so that for
260
instance %(name)s can be used in the command.
261
current_checker_command: string; current running checker_command
262
approved_delay: datetime.timedelta(); Time to wait for approval
263
_approved: bool(); 'None' if not yet approved/disapproved
264
approved_duration: datetime.timedelta(); Duration of one approval
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
def _timedelta_to_milliseconds(td):
269
"Convert a datetime.timedelta() to milliseconds"
270
return ((td.days * 24 * 60 * 60 * 1000)
271
+ (td.seconds * 1000)
272
+ (td.microseconds // 1000))
312
runtime_expansions = ("approval_delay", "approval_duration",
313
"created", "enabled", "fingerprint",
314
"host", "interval", "last_checked_ok",
315
"last_enabled", "name", "timeout")
274
317
def timeout_milliseconds(self):
275
318
"Return the 'timeout' attribute in milliseconds"
276
return self._timedelta_to_milliseconds(self.timeout)
319
return _timedelta_to_milliseconds(self.timeout)
321
def extended_timeout_milliseconds(self):
322
"Return the 'extended_timeout' attribute in milliseconds"
323
return _timedelta_to_milliseconds(self.extended_timeout)
278
325
def interval_milliseconds(self):
279
326
"Return the 'interval' attribute in milliseconds"
280
return self._timedelta_to_milliseconds(self.interval)
282
def approved_delay_milliseconds(self):
283
return self._timedelta_to_milliseconds(self.approved_delay)
327
return _timedelta_to_milliseconds(self.interval)
329
def approval_delay_milliseconds(self):
330
return _timedelta_to_milliseconds(self.approval_delay)
285
332
def __init__(self, name = None, disable_hook=None, config=None):
286
333
"""Note: the 'checker' key in 'config' sets the
290
337
if config is None:
292
logger.debug(u"Creating client %r", self.name)
339
logger.debug("Creating client %r", self.name)
293
340
# Uppercase and remove spaces from fingerprint for later
294
341
# comparison purposes with return value from the fingerprint()
296
self.fingerprint = (config[u"fingerprint"].upper()
298
logger.debug(u" Fingerprint: %s", self.fingerprint)
299
if u"secret" in config:
300
self.secret = config[u"secret"].decode(u"base64")
301
elif u"secfile" in config:
343
self.fingerprint = (config["fingerprint"].upper()
345
logger.debug(" Fingerprint: %s", self.fingerprint)
346
if "secret" in config:
347
self.secret = config["secret"].decode("base64")
348
elif "secfile" in config:
302
349
with open(os.path.expanduser(os.path.expandvars
303
(config[u"secfile"])),
350
(config["secfile"])),
304
351
"rb") as secfile:
305
352
self.secret = secfile.read()
307
raise TypeError(u"No secret or secfile for client %s"
354
raise TypeError("No secret or secfile for client %s"
309
self.host = config.get(u"host", u"")
356
self.host = config.get("host", "")
310
357
self.created = datetime.datetime.utcnow()
311
358
self.enabled = False
359
self.last_approval_request = None
312
360
self.last_enabled = None
313
361
self.last_checked_ok = None
314
self.timeout = string_to_delta(config[u"timeout"])
315
self.interval = string_to_delta(config[u"interval"])
362
self.timeout = string_to_delta(config["timeout"])
363
self.extended_timeout = string_to_delta(config["extended_timeout"])
364
self.interval = string_to_delta(config["interval"])
316
365
self.disable_hook = disable_hook
317
366
self.checker = None
318
367
self.checker_initiator_tag = None
319
368
self.disable_initiator_tag = None
320
370
self.checker_callback_tag = None
321
self.checker_command = config[u"checker"]
371
self.checker_command = config["checker"]
322
372
self.current_checker_command = None
323
373
self.last_connect = None
324
374
self._approved = None
325
self.approved_by_default = config.get(u"approved_by_default",
375
self.approved_by_default = config.get("approved_by_default",
327
377
self.approvals_pending = 0
328
self.approved_delay = string_to_delta(
329
config[u"approved_delay"])
330
self.approved_duration = string_to_delta(
331
config[u"approved_duration"])
378
self.approval_delay = string_to_delta(
379
config["approval_delay"])
380
self.approval_duration = string_to_delta(
381
config["approval_duration"])
332
382
self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
334
384
def send_changedstate(self):
586
647
# No such property
587
raise DBusPropertyNotFound(self.dbus_object_path + u":"
588
+ interface_name + u"."
648
raise DBusPropertyNotFound(self.dbus_object_path + ":"
649
+ interface_name + "."
591
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ss",
652
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
593
654
def Get(self, interface_name, property_name):
594
655
"""Standard D-Bus property Get() method, see D-Bus standard.
596
657
prop = self._get_dbus_property(interface_name, property_name)
597
if prop._dbus_access == u"write":
658
if prop._dbus_access == "write":
598
659
raise DBusPropertyAccessException(property_name)
600
if not hasattr(value, u"variant_level"):
661
if not hasattr(value, "variant_level"):
602
663
return type(value)(value, variant_level=value.variant_level+1)
604
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ssv")
665
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
605
666
def Set(self, interface_name, property_name, value):
606
667
"""Standard D-Bus property Set() method, see D-Bus standard.
608
669
prop = self._get_dbus_property(interface_name, property_name)
609
if prop._dbus_access == u"read":
670
if prop._dbus_access == "read":
610
671
raise DBusPropertyAccessException(property_name)
611
if prop._dbus_get_args_options[u"byte_arrays"]:
672
if prop._dbus_get_args_options["byte_arrays"]:
612
673
# The byte_arrays option is not supported yet on
613
674
# signatures other than "ay".
614
if prop._dbus_signature != u"ay":
675
if prop._dbus_signature != "ay":
616
677
value = dbus.ByteArray(''.join(unichr(byte)
617
678
for byte in value))
620
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"s",
621
out_signature=u"a{sv}")
681
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
682
out_signature="a{sv}")
622
683
def GetAll(self, interface_name):
623
684
"""Standard D-Bus property GetAll() method, see D-Bus
626
687
Note: Will not include properties with access="write".
655
716
document = xml.dom.minidom.parseString(xmlstring)
656
717
def make_tag(document, name, prop):
657
e = document.createElement(u"property")
658
e.setAttribute(u"name", name)
659
e.setAttribute(u"type", prop._dbus_signature)
660
e.setAttribute(u"access", prop._dbus_access)
718
e = document.createElement("property")
719
e.setAttribute("name", name)
720
e.setAttribute("type", prop._dbus_signature)
721
e.setAttribute("access", prop._dbus_access)
662
for if_tag in document.getElementsByTagName(u"interface"):
723
for if_tag in document.getElementsByTagName("interface"):
663
724
for tag in (make_tag(document, name, prop)
665
726
in self._get_all_dbus_properties()
666
727
if prop._dbus_interface
667
== if_tag.getAttribute(u"name")):
728
== if_tag.getAttribute("name")):
668
729
if_tag.appendChild(tag)
669
730
# Add the names to the return values for the
670
731
# "org.freedesktop.DBus.Properties" methods
671
if (if_tag.getAttribute(u"name")
672
== u"org.freedesktop.DBus.Properties"):
673
for cn in if_tag.getElementsByTagName(u"method"):
674
if cn.getAttribute(u"name") == u"Get":
675
for arg in cn.getElementsByTagName(u"arg"):
676
if (arg.getAttribute(u"direction")
678
arg.setAttribute(u"name", u"value")
679
elif cn.getAttribute(u"name") == u"GetAll":
680
for arg in cn.getElementsByTagName(u"arg"):
681
if (arg.getAttribute(u"direction")
683
arg.setAttribute(u"name", u"props")
684
xmlstring = document.toxml(u"utf-8")
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")
685
746
document.unlink()
686
747
except (AttributeError, xml.dom.DOMException,
687
xml.parsers.expat.ExpatError), error:
688
logger.error(u"Failed to override Introspection method",
748
xml.parsers.expat.ExpatError) as error:
749
logger.error("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)
693
762
class ClientDBus(Client, DBusObjectWithProperties):
694
763
"""A Client class using D-Bus
705
778
Client.__init__(self, *args, **kwargs)
706
779
# Only now, when this client is initialized, can it show up on
781
client_object_name = unicode(self.name).translate(
708
784
self.dbus_object_path = (dbus.ObjectPath
710
+ self.name.replace(u".", u"_")))
785
("/clients/" + client_object_name))
711
786
DBusObjectWithProperties.__init__(self, self.bus,
712
787
self.dbus_object_path)
714
def _get_approvals_pending(self):
715
return self._approvals_pending
716
def _set_approvals_pending(self, value):
717
old_value = self._approvals_pending
718
self._approvals_pending = value
720
if (hasattr(self, "dbus_object_path")
721
and bval is not bool(old_value)):
722
dbus_bool = dbus.Boolean(bval, variant_level=1)
723
self.PropertyChanged(dbus.String(u"approved_pending"),
726
approvals_pending = property(_get_approvals_pending,
727
_set_approvals_pending)
728
del _get_approvals_pending, _set_approvals_pending
731
def _datetime_to_dbus(dt, variant_level=0):
732
"""Convert a UTC datetime.datetime() to a D-Bus type."""
733
return dbus.String(dt.isoformat(),
734
variant_level=variant_level)
737
oldstate = getattr(self, u"enabled", False)
738
r = Client.enable(self)
739
if oldstate != self.enabled:
741
self.PropertyChanged(dbus.String(u"enabled"),
742
dbus.Boolean(True, variant_level=1))
743
self.PropertyChanged(
744
dbus.String(u"last_enabled"),
745
self._datetime_to_dbus(self.last_enabled,
749
def disable(self, quiet = False):
750
oldstate = getattr(self, u"enabled", False)
751
r = Client.disable(self, quiet=quiet)
752
if not quiet and oldstate != self.enabled:
754
self.PropertyChanged(dbus.String(u"enabled"),
755
dbus.Boolean(False, variant_level=1))
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
758
845
def __del__(self, *args, **kwargs):
760
847
self.remove_from_connection()
761
848
except LookupError:
763
if hasattr(DBusObjectWithProperties, u"__del__"):
850
if hasattr(DBusObjectWithProperties, "__del__"):
764
851
DBusObjectWithProperties.__del__(self, *args, **kwargs)
765
852
Client.__del__(self, *args, **kwargs)
916
# approved_pending - property
917
@dbus_service_property(_interface, signature=u"b", access=u"read")
918
def approved_pending_dbus_property(self):
980
# ApprovalPending - property
981
@dbus_service_property(_interface, signature="b", access="read")
982
def ApprovalPending_dbus_property(self):
919
983
return dbus.Boolean(bool(self.approvals_pending))
921
# approved_by_default - property
922
@dbus_service_property(_interface, signature=u"b",
924
def approved_by_default_dbus_property(self):
925
return dbus.Boolean(self.approved_by_default)
927
# approved_delay - property
928
@dbus_service_property(_interface, signature=u"t",
930
def approved_delay_dbus_property(self):
931
return dbus.UInt64(self.approved_delay_milliseconds())
933
# approved_duration - property
934
@dbus_service_property(_interface, signature=u"t",
936
def approved_duration_dbus_property(self):
937
return dbus.UInt64(self._timedelta_to_milliseconds(
938
self.approved_duration))
941
@dbus_service_property(_interface, signature=u"s", access=u"read")
942
def name_dbus_property(self):
985
# ApprovedByDefault - property
986
@dbus_service_property(_interface, signature="b",
988
def ApprovedByDefault_dbus_property(self, value=None):
989
if value is None: # get
990
return dbus.Boolean(self.approved_by_default)
991
self.approved_by_default = bool(value)
993
# ApprovalDelay - property
994
@dbus_service_property(_interface, signature="t",
996
def ApprovalDelay_dbus_property(self, value=None):
997
if value is None: # get
998
return dbus.UInt64(self.approval_delay_milliseconds())
999
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1001
# ApprovalDuration - property
1002
@dbus_service_property(_interface, signature="t",
1004
def ApprovalDuration_dbus_property(self, value=None):
1005
if value is None: # get
1006
return dbus.UInt64(_timedelta_to_milliseconds(
1007
self.approval_duration))
1008
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1011
@dbus_service_property(_interface, signature="s", access="read")
1012
def Name_dbus_property(self):
943
1013
return dbus.String(self.name)
945
# fingerprint - property
946
@dbus_service_property(_interface, signature=u"s", access=u"read")
947
def fingerprint_dbus_property(self):
1015
# Fingerprint - property
1016
@dbus_service_property(_interface, signature="s", access="read")
1017
def Fingerprint_dbus_property(self):
948
1018
return dbus.String(self.fingerprint)
951
@dbus_service_property(_interface, signature=u"s",
953
def host_dbus_property(self, value=None):
1021
@dbus_service_property(_interface, signature="s",
1023
def Host_dbus_property(self, value=None):
954
1024
if value is None: # get
955
1025
return dbus.String(self.host)
956
1026
self.host = value
958
self.PropertyChanged(dbus.String(u"host"),
959
dbus.String(value, variant_level=1))
962
@dbus_service_property(_interface, signature=u"s", access=u"read")
963
def created_dbus_property(self):
964
return dbus.String(self._datetime_to_dbus(self.created))
966
# last_enabled - property
967
@dbus_service_property(_interface, signature=u"s", access=u"read")
968
def last_enabled_dbus_property(self):
969
if self.last_enabled is None:
970
return dbus.String(u"")
971
return dbus.String(self._datetime_to_dbus(self.last_enabled))
974
@dbus_service_property(_interface, signature=u"b",
976
def enabled_dbus_property(self, value=None):
1028
# Created - property
1029
@dbus_service_property(_interface, signature="s", access="read")
1030
def Created_dbus_property(self):
1031
return dbus.String(datetime_to_dbus(self.created))
1033
# LastEnabled - property
1034
@dbus_service_property(_interface, signature="s", access="read")
1035
def LastEnabled_dbus_property(self):
1036
return datetime_to_dbus(self.last_enabled)
1038
# Enabled - property
1039
@dbus_service_property(_interface, signature="b",
1041
def Enabled_dbus_property(self, value=None):
977
1042
if value is None: # get
978
1043
return dbus.Boolean(self.enabled)
984
# last_checked_ok - property
985
@dbus_service_property(_interface, signature=u"s",
987
def last_checked_ok_dbus_property(self, value=None):
1049
# LastCheckedOK - property
1050
@dbus_service_property(_interface, signature="s",
1052
def LastCheckedOK_dbus_property(self, value=None):
988
1053
if value is not None:
989
1054
self.checked_ok()
991
if self.last_checked_ok is None:
992
return dbus.String(u"")
993
return dbus.String(self._datetime_to_dbus(self
997
@dbus_service_property(_interface, signature=u"t",
999
def timeout_dbus_property(self, value=None):
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)
1068
# Timeout - property
1069
@dbus_service_property(_interface, signature="t",
1071
def Timeout_dbus_property(self, value=None):
1000
1072
if value is None: # get
1001
1073
return dbus.UInt64(self.timeout_milliseconds())
1002
1074
self.timeout = datetime.timedelta(0, 0, 0, value)
1004
self.PropertyChanged(dbus.String(u"timeout"),
1005
dbus.UInt64(value, variant_level=1))
1006
if getattr(self, u"disable_initiator_tag", None) is None:
1075
if getattr(self, "disable_initiator_tag", None) is None:
1008
1077
# Reschedule timeout
1009
1078
gobject.source_remove(self.disable_initiator_tag)
1010
1079
self.disable_initiator_tag = None
1011
1081
time_to_die = (self.
1012
1082
_timedelta_to_milliseconds((self
1013
1083
.last_checked_ok
1018
1088
# The timeout has passed
1091
self.expires = (datetime.datetime.utcnow()
1092
+ datetime.timedelta(milliseconds = time_to_die))
1021
1093
self.disable_initiator_tag = (gobject.timeout_add
1022
1094
(time_to_die, self.disable))
1024
# interval - property
1025
@dbus_service_property(_interface, signature=u"t",
1026
access=u"readwrite")
1027
def interval_dbus_property(self, value=None):
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
# Interval - property
1105
@dbus_service_property(_interface, signature="t",
1107
def Interval_dbus_property(self, value=None):
1028
1108
if value is None: # get
1029
1109
return dbus.UInt64(self.interval_milliseconds())
1030
1110
self.interval = datetime.timedelta(0, 0, 0, value)
1032
self.PropertyChanged(dbus.String(u"interval"),
1033
dbus.UInt64(value, variant_level=1))
1034
if getattr(self, u"checker_initiator_tag", None) is None:
1111
if getattr(self, "checker_initiator_tag", None) is None:
1036
1113
# Reschedule checker run
1037
1114
gobject.source_remove(self.checker_initiator_tag)
1038
1115
self.checker_initiator_tag = (gobject.timeout_add
1039
1116
(value, self.start_checker))
1040
1117
self.start_checker() # Start one now, too
1042
# checker - property
1043
@dbus_service_property(_interface, signature=u"s",
1044
access=u"readwrite")
1045
def checker_dbus_property(self, value=None):
1119
# Checker - property
1120
@dbus_service_property(_interface, signature="s",
1122
def Checker_dbus_property(self, value=None):
1046
1123
if value is None: # get
1047
1124
return dbus.String(self.checker_command)
1048
1125
self.checker_command = value
1050
self.PropertyChanged(dbus.String(u"checker"),
1051
dbus.String(self.checker_command,
1054
# checker_running - property
1055
@dbus_service_property(_interface, signature=u"b",
1056
access=u"readwrite")
1057
def checker_running_dbus_property(self, value=None):
1127
# CheckerRunning - property
1128
@dbus_service_property(_interface, signature="b",
1130
def CheckerRunning_dbus_property(self, value=None):
1058
1131
if value is None: # get
1059
1132
return dbus.Boolean(self.checker is not None)
1111
1184
def handle(self):
1112
1185
with contextlib.closing(self.server.child_pipe) as child_pipe:
1113
logger.info(u"TCP connection from: %s",
1186
logger.info("TCP connection from: %s",
1114
1187
unicode(self.client_address))
1115
logger.debug(u"Pipe FD: %d",
1188
logger.debug("Pipe FD: %d",
1116
1189
self.server.child_pipe.fileno())
1118
1191
session = (gnutls.connection
1119
1192
.ClientSession(self.request,
1120
1193
gnutls.connection
1121
1194
.X509Credentials()))
1123
1196
# Note: gnutls.connection.X509Credentials is really a
1124
1197
# generic GnuTLS certificate credentials object so long as
1125
1198
# no X.509 keys are added to it. Therefore, we can use it
1126
1199
# here despite using OpenPGP certificates.
1128
#priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
1129
# u"+AES-256-CBC", u"+SHA1",
1130
# u"+COMP-NULL", u"+CTYPE-OPENPGP",
1201
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1202
# "+AES-256-CBC", "+SHA1",
1203
# "+COMP-NULL", "+CTYPE-OPENPGP",
1132
1205
# Use a fallback default, since this MUST be set.
1133
1206
priority = self.server.gnutls_priority
1134
1207
if priority is None:
1135
priority = u"NORMAL"
1136
1209
(gnutls.library.functions
1137
1210
.gnutls_priority_set_direct(session._c_object,
1138
1211
priority, None))
1140
1213
# Start communication using the Mandos protocol
1141
1214
# Get protocol number
1142
1215
line = self.request.makefile().readline()
1143
logger.debug(u"Protocol version: %r", line)
1216
logger.debug("Protocol version: %r", line)
1145
1218
if int(line.strip().split()[0]) > 1:
1146
1219
raise RuntimeError
1147
except (ValueError, IndexError, RuntimeError), error:
1148
logger.error(u"Unknown protocol version: %s", error)
1220
except (ValueError, IndexError, RuntimeError) as error:
1221
logger.error("Unknown protocol version: %s", error)
1151
1224
# Start GnuTLS connection
1153
1226
session.handshake()
1154
except gnutls.errors.GNUTLSError, error:
1155
logger.warning(u"Handshake failed: %s", error)
1227
except gnutls.errors.GNUTLSError as error:
1228
logger.warning("Handshake failed: %s", error)
1156
1229
# Do not run session.bye() here: the session is not
1157
1230
# established. Just abandon the request.
1159
logger.debug(u"Handshake succeeded")
1232
logger.debug("Handshake succeeded")
1161
1234
approval_required = False
1164
1237
fpr = self.fingerprint(self.peer_certificate
1166
except (TypeError, gnutls.errors.GNUTLSError), error:
1167
logger.warning(u"Bad certificate: %s", error)
1240
gnutls.errors.GNUTLSError) as error:
1241
logger.warning("Bad certificate: %s", error)
1169
logger.debug(u"Fingerprint: %s", fpr)
1243
logger.debug("Fingerprint: %s", fpr)
1172
1246
client = ProxyClient(child_pipe, fpr,
1173
1247
self.client_address)
1174
1248
except KeyError:
1177
if client.approved_delay:
1178
delay = client.approved_delay
1251
if client.approval_delay:
1252
delay = client.approval_delay
1179
1253
client.approvals_pending += 1
1180
1254
approval_required = True
1183
1257
if not client.enabled:
1184
logger.warning(u"Client %s is disabled",
1258
logger.info("Client %s is disabled",
1186
1260
if self.server.use_dbus:
1187
1261
# Emit D-Bus signal
1188
1262
client.Rejected("Disabled")
1191
if client._approved or not client.approved_delay:
1265
if client._approved or not client.approval_delay:
1192
1266
#We are approved or approval is disabled
1194
1268
elif client._approved is None:
1195
logger.info(u"Client %s need approval",
1269
logger.info("Client %s needs approval",
1197
1271
if self.server.use_dbus:
1198
1272
# Emit D-Bus signal
1199
1273
client.NeedApproval(
1200
client.approved_delay_milliseconds(),
1274
client.approval_delay_milliseconds(),
1201
1275
client.approved_by_default)
1203
logger.warning(u"Client %s was not approved",
1277
logger.warning("Client %s was not approved",
1205
1279
if self.server.use_dbus:
1206
1280
# Emit D-Bus signal
1207
client.Rejected("Disapproved")
1281
client.Rejected("Denied")
1210
1284
#wait until timeout or approved
1617
1689
##################################################################
1618
1690
# Parsing of options, both command line and config file
1620
parser = optparse.OptionParser(version = "%%prog %s" % version)
1621
parser.add_option("-i", u"--interface", type=u"string",
1622
metavar="IF", help=u"Bind to interface IF")
1623
parser.add_option("-a", u"--address", type=u"string",
1624
help=u"Address to listen for requests on")
1625
parser.add_option("-p", u"--port", type=u"int",
1626
help=u"Port number to receive requests on")
1627
parser.add_option("--check", action=u"store_true",
1628
help=u"Run self-test")
1629
parser.add_option("--debug", action=u"store_true",
1630
help=u"Debug mode; run in foreground and log to"
1632
parser.add_option("--debuglevel", type=u"string", metavar="Level",
1633
help=u"Debug level for stdout output")
1634
parser.add_option("--priority", type=u"string", help=u"GnuTLS"
1635
u" priority string (see GnuTLS documentation)")
1636
parser.add_option("--servicename", type=u"string",
1637
metavar=u"NAME", help=u"Zeroconf service name")
1638
parser.add_option("--configdir", type=u"string",
1639
default=u"/etc/mandos", metavar=u"DIR",
1640
help=u"Directory to search for configuration"
1642
parser.add_option("--no-dbus", action=u"store_false",
1643
dest=u"use_dbus", help=u"Do not provide D-Bus"
1644
u" system bus interface")
1645
parser.add_option("--no-ipv6", action=u"store_false",
1646
dest=u"use_ipv6", help=u"Do not use IPv6")
1647
options = parser.parse_args()[0]
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()
1649
1724
if options.check:
1654
1729
# Default values for config file for server-global settings
1655
server_defaults = { u"interface": u"",
1660
u"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1661
u"servicename": u"Mandos",
1662
u"use_dbus": u"True",
1663
u"use_ipv6": u"True",
1730
server_defaults = { "interface": "",
1735
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1736
"servicename": "Mandos",
1667
1742
# Parse config file for server-global settings
1668
1743
server_config = configparser.SafeConfigParser(server_defaults)
1669
1744
del server_defaults
1670
1745
server_config.read(os.path.join(options.configdir,
1672
1747
# Convert the SafeConfigParser object to a dict
1673
1748
server_settings = server_config.defaults()
1674
1749
# Use the appropriate methods on the non-string config options
1675
for option in (u"debug", u"use_dbus", u"use_ipv6"):
1676
server_settings[option] = server_config.getboolean(u"DEFAULT",
1750
for option in ("debug", "use_dbus", "use_ipv6"):
1751
server_settings[option] = server_config.getboolean("DEFAULT",
1678
1753
if server_settings["port"]:
1679
server_settings["port"] = server_config.getint(u"DEFAULT",
1754
server_settings["port"] = server_config.getint("DEFAULT",
1681
1756
del server_config
1683
1758
# Override the settings from the config file with command line
1684
1759
# options, if set.
1685
for option in (u"interface", u"address", u"port", u"debug",
1686
u"priority", u"servicename", u"configdir",
1687
u"use_dbus", u"use_ipv6", u"debuglevel"):
1760
for option in ("interface", "address", "port", "debug",
1761
"priority", "servicename", "configdir",
1762
"use_dbus", "use_ipv6", "debuglevel"):
1688
1763
value = getattr(options, option)
1689
1764
if value is not None:
1690
1765
server_settings[option] = value
1698
1773
##################################################################
1700
1775
# For convenience
1701
debug = server_settings[u"debug"]
1702
debuglevel = server_settings[u"debuglevel"]
1703
use_dbus = server_settings[u"use_dbus"]
1704
use_ipv6 = server_settings[u"use_ipv6"]
1706
if server_settings[u"servicename"] != u"Mandos":
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":
1707
1782
syslogger.setFormatter(logging.Formatter
1708
(u'Mandos (%s) [%%(process)d]:'
1709
u' %%(levelname)s: %%(message)s'
1710
% server_settings[u"servicename"]))
1783
('Mandos (%s) [%%(process)d]:'
1784
' %%(levelname)s: %%(message)s'
1785
% server_settings["servicename"]))
1712
1787
# Parse config file with clients
1713
client_defaults = { u"timeout": u"1h",
1715
u"checker": u"fping -q -- %%(host)s",
1717
u"approved_delay": u"0s",
1718
u"approved_duration": u"1s",
1788
client_defaults = { "timeout": "5m",
1789
"extended_timeout": "15m",
1791
"checker": "fping -q -- %%(host)s",
1793
"approval_delay": "0s",
1794
"approval_duration": "1s",
1720
1796
client_config = configparser.SafeConfigParser(client_defaults)
1721
client_config.read(os.path.join(server_settings[u"configdir"],
1797
client_config.read(os.path.join(server_settings["configdir"],
1724
1800
global mandos_dbus_service
1725
1801
mandos_dbus_service = None
1727
tcp_server = MandosServer((server_settings[u"address"],
1728
server_settings[u"port"]),
1803
tcp_server = MandosServer((server_settings["address"],
1804
server_settings["port"]),
1730
interface=server_settings[u"interface"],
1806
interface=(server_settings["interface"]
1731
1808
use_ipv6=use_ipv6,
1732
1809
gnutls_priority=
1733
server_settings[u"priority"],
1810
server_settings["priority"],
1734
1811
use_dbus=use_dbus)
1735
pidfilename = u"/var/run/mandos.pid"
1737
pidfile = open(pidfilename, u"w")
1739
logger.error(u"Could not open file %r", pidfilename)
1813
pidfilename = "/var/run/mandos.pid"
1815
pidfile = open(pidfilename, "w")
1817
logger.error("Could not open file %r", pidfilename)
1742
uid = pwd.getpwnam(u"_mandos").pw_uid
1743
gid = pwd.getpwnam(u"_mandos").pw_gid
1820
uid = pwd.getpwnam("_mandos").pw_uid
1821
gid = pwd.getpwnam("_mandos").pw_gid
1744
1822
except KeyError:
1746
uid = pwd.getpwnam(u"mandos").pw_uid
1747
gid = pwd.getpwnam(u"mandos").pw_gid
1824
uid = pwd.getpwnam("mandos").pw_uid
1825
gid = pwd.getpwnam("mandos").pw_gid
1748
1826
except KeyError:
1750
uid = pwd.getpwnam(u"nobody").pw_uid
1751
gid = pwd.getpwnam(u"nobody").pw_gid
1828
uid = pwd.getpwnam("nobody").pw_uid
1829
gid = pwd.getpwnam("nobody").pw_gid
1752
1830
except KeyError:
1758
except OSError, error:
1836
except OSError as error:
1759
1837
if error[0] != errno.EPERM:
1762
# Enable all possible GnuTLS debugging
1765
1840
if not debug and not debuglevel:
1766
1841
syslogger.setLevel(logging.WARNING)
1767
1842
console.setLevel(logging.WARNING)
1800
1881
# End of Avahi example code
1803
bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos",
1884
bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
1804
1885
bus, do_not_queue=True)
1805
except dbus.exceptions.NameExistsException, e:
1806
logger.error(unicode(e) + u", disabling D-Bus")
1886
except dbus.exceptions.NameExistsException as e:
1887
logger.error(unicode(e) + ", disabling D-Bus")
1807
1888
use_dbus = False
1808
server_settings[u"use_dbus"] = False
1889
server_settings["use_dbus"] = False
1809
1890
tcp_server.use_dbus = False
1810
1891
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1811
service = AvahiService(name = server_settings[u"servicename"],
1812
servicetype = u"_mandos._tcp",
1892
service = AvahiService(name = server_settings["servicename"],
1893
servicetype = "_mandos._tcp",
1813
1894
protocol = protocol, bus = bus)
1814
1895
if server_settings["interface"]:
1815
1896
service.interface = (if_nametoindex
1816
(str(server_settings[u"interface"])))
1819
# Close all input and output, do double fork, etc.
1897
(str(server_settings["interface"])))
1822
1899
global multiprocessing_manager
1823
1900
multiprocessing_manager = multiprocessing.Manager()
1867
1945
class MandosDBusService(dbus.service.Object):
1868
1946
"""A D-Bus proxy object"""
1869
1947
def __init__(self):
1870
dbus.service.Object.__init__(self, bus, u"/")
1871
_interface = u"se.bsnet.fukt.Mandos"
1948
dbus.service.Object.__init__(self, bus, "/")
1949
_interface = "se.bsnet.fukt.Mandos"
1873
@dbus.service.signal(_interface, signature=u"o")
1951
@dbus.service.signal(_interface, signature="o")
1874
1952
def ClientAdded(self, objpath):
1878
@dbus.service.signal(_interface, signature=u"ss")
1956
@dbus.service.signal(_interface, signature="ss")
1879
1957
def ClientNotFound(self, fingerprint, address):
1883
@dbus.service.signal(_interface, signature=u"os")
1961
@dbus.service.signal(_interface, signature="os")
1884
1962
def ClientRemoved(self, objpath, name):
1888
@dbus.service.method(_interface, out_signature=u"ao")
1966
@dbus.service.method(_interface, out_signature="ao")
1889
1967
def GetAllClients(self):
1891
1969
return dbus.Array(c.dbus_object_path
1892
1970
for c in tcp_server.clients)
1894
1972
@dbus.service.method(_interface,
1895
out_signature=u"a{oa{sv}}")
1973
out_signature="a{oa{sv}}")
1896
1974
def GetAllClientsWithProperties(self):
1898
1976
return dbus.Dictionary(
1899
((c.dbus_object_path, c.GetAll(u""))
1977
((c.dbus_object_path, c.GetAll(""))
1900
1978
for c in tcp_server.clients),
1901
signature=u"oa{sv}")
1903
@dbus.service.method(_interface, in_signature=u"o")
1981
@dbus.service.method(_interface, in_signature="o")
1904
1982
def RemoveClient(self, object_path):
1906
1984
for c in tcp_server.clients: