148
151
self.group = None # our entry group
149
152
self.server = None
154
self.entry_group_state_changed_match = None
151
155
def rename(self):
152
156
"""Derived from the Avahi example code"""
153
157
if self.rename_count >= self.max_renames:
154
logger.critical(u"No suitable Zeroconf service name found"
155
u" after %i retries, exiting.",
158
logger.critical("No suitable Zeroconf service name found"
159
" after %i retries, exiting.",
156
160
self.rename_count)
157
raise AvahiServiceError(u"Too many renames")
158
self.name = self.server.GetAlternativeServiceName(self.name)
159
logger.info(u"Changing Zeroconf service name to %r ...",
161
raise AvahiServiceError("Too many renames")
162
self.name = unicode(self.server.GetAlternativeServiceName(self.name))
163
logger.info("Changing Zeroconf service name to %r ...",
161
165
syslogger.setFormatter(logging.Formatter
162
(u'Mandos (%s) [%%(process)d]:'
163
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)
167
176
self.rename_count += 1
168
177
def remove(self):
169
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
170
182
if self.group is not None:
171
183
self.group.Reset()
173
185
"""Derived from the Avahi example code"""
174
187
if self.group is None:
175
188
self.group = dbus.Interface(
176
189
self.bus.get_object(avahi.DBUS_NAME,
177
190
self.server.EntryGroupNew()),
178
191
avahi.DBUS_INTERFACE_ENTRY_GROUP)
179
self.group.connect_to_signal('StateChanged',
181
.entry_group_state_changed)
182
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' ...",
183
196
self.name, self.type)
184
197
self.group.AddService(
192
205
self.group.Commit()
193
206
def entry_group_state_changed(self, state, error):
194
207
"""Derived from the Avahi example code"""
195
logger.debug(u"Avahi state change: %i", state)
208
logger.debug("Avahi entry group state change: %i", state)
197
210
if state == avahi.ENTRY_GROUP_ESTABLISHED:
198
logger.debug(u"Zeroconf service established.")
211
logger.debug("Zeroconf service established.")
199
212
elif state == avahi.ENTRY_GROUP_COLLISION:
200
logger.warning(u"Zeroconf service name collision.")
213
logger.info("Zeroconf service name collision.")
202
215
elif state == avahi.ENTRY_GROUP_FAILURE:
203
logger.critical(u"Avahi: Error in group state changed %s",
216
logger.critical("Avahi: Error in group state changed %s",
205
raise AvahiGroupError(u"State changed: %s"
218
raise AvahiGroupError("State changed: %s"
206
219
% unicode(error))
207
220
def cleanup(self):
208
221
"""Derived from the Avahi example code"""
209
222
if self.group is not None:
225
except (dbus.exceptions.UnknownMethodException,
226
dbus.exceptions.DBusException) as e:
211
228
self.group = None
212
def server_state_changed(self, state):
230
def server_state_changed(self, state, error=None):
213
231
"""Derived from the Avahi example code"""
214
if state == avahi.SERVER_COLLISION:
215
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)
217
247
elif state == avahi.SERVER_RUNNING:
251
logger.debug("Unknown state: %r", state)
253
logger.debug("Unknown state: %r: %r", state, error)
219
254
def activate(self):
220
255
"""Derived from the Avahi example code"""
221
256
if self.server is None:
222
257
self.server = dbus.Interface(
223
258
self.bus.get_object(avahi.DBUS_NAME,
224
avahi.DBUS_PATH_SERVER),
259
avahi.DBUS_PATH_SERVER,
260
follow_name_owner_changes=True),
225
261
avahi.DBUS_INTERFACE_SERVER)
226
self.server.connect_to_signal(u"StateChanged",
262
self.server.connect_to_signal("StateChanged",
227
263
self.server_state_changed)
228
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))
231
273
class Client(object):
232
274
"""A representation of a client host served by this server.
235
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
237
294
fingerprint: string (40 or 32 hexadecimal digits); used to
238
295
uniquely identify the client
239
secret: bytestring; sent verbatim (over TLS) to client
240
296
host: string; available for use by the checker command
241
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
242
300
last_enabled: datetime.datetime(); (UTC)
244
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
245
304
timeout: datetime.timedelta(); How long from last_checked_ok
246
305
until this client is disabled
247
interval: datetime.timedelta(); How often to start a new checker
248
disable_hook: If set, called by disable() as disable_hook(self)
249
checker: subprocess.Popen(); a running checker process used
250
to see if the client lives.
251
'None' if no process is running.
252
checker_initiator_tag: a gobject event source tag, or None
253
disable_initiator_tag: - '' -
254
checker_callback_tag: - '' -
255
checker_command: string; External command which is run to check if
256
client lives. %() expansions are done at
257
runtime with vars(self) as dict, so that for
258
instance %(name)s can be used in the command.
259
current_checker_command: string; current running checker_command
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
263
def _timedelta_to_milliseconds(td):
264
"Convert a datetime.timedelta() to milliseconds"
265
return ((td.days * 24 * 60 * 60 * 1000)
266
+ (td.seconds * 1000)
267
+ (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")
269
317
def timeout_milliseconds(self):
270
318
"Return the 'timeout' attribute in milliseconds"
271
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)
273
325
def interval_milliseconds(self):
274
326
"Return the 'interval' attribute in milliseconds"
275
return self._timedelta_to_milliseconds(self.interval)
327
return _timedelta_to_milliseconds(self.interval)
329
def approval_delay_milliseconds(self):
330
return _timedelta_to_milliseconds(self.approval_delay)
277
332
def __init__(self, name = None, disable_hook=None, config=None):
278
333
"""Note: the 'checker' key in 'config' sets the
282
337
if config is None:
284
logger.debug(u"Creating client %r", self.name)
339
logger.debug("Creating client %r", self.name)
285
340
# Uppercase and remove spaces from fingerprint for later
286
341
# comparison purposes with return value from the fingerprint()
288
self.fingerprint = (config[u"fingerprint"].upper()
290
logger.debug(u" Fingerprint: %s", self.fingerprint)
291
if u"secret" in config:
292
self.secret = config[u"secret"].decode(u"base64")
293
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:
294
349
with open(os.path.expanduser(os.path.expandvars
295
(config[u"secfile"])),
350
(config["secfile"])),
296
351
"rb") as secfile:
297
352
self.secret = secfile.read()
299
raise TypeError(u"No secret or secfile for client %s"
354
raise TypeError("No secret or secfile for client %s"
301
self.host = config.get(u"host", u"")
356
self.host = config.get("host", "")
302
357
self.created = datetime.datetime.utcnow()
303
358
self.enabled = False
359
self.last_approval_request = None
304
360
self.last_enabled = None
305
361
self.last_checked_ok = None
306
self.timeout = string_to_delta(config[u"timeout"])
307
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"])
308
365
self.disable_hook = disable_hook
309
366
self.checker = None
310
367
self.checker_initiator_tag = None
311
368
self.disable_initiator_tag = None
312
370
self.checker_callback_tag = None
313
self.checker_command = config[u"checker"]
371
self.checker_command = config["checker"]
314
372
self.current_checker_command = None
315
373
self.last_connect = None
374
self._approved = None
375
self.approved_by_default = config.get("approved_by_default",
377
self.approvals_pending = 0
378
self.approval_delay = string_to_delta(
379
config["approval_delay"])
380
self.approval_duration = string_to_delta(
381
config["approval_duration"])
382
self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
384
def send_changedstate(self):
385
self.changedstate.acquire()
386
self.changedstate.notify_all()
387
self.changedstate.release()
317
389
def enable(self):
318
390
"""Start this client's checker and timeout hooks"""
319
if getattr(self, u"enabled", False):
391
if getattr(self, "enabled", False):
320
392
# Already enabled
322
self.last_enabled = datetime.datetime.utcnow()
394
self.send_changedstate()
323
395
# Schedule a new checker to be started an 'interval' from now,
324
396
# and every interval from then on.
325
397
self.checker_initiator_tag = (gobject.timeout_add
326
398
(self.interval_milliseconds(),
327
399
self.start_checker))
328
400
# Schedule a disable() when 'timeout' has passed
401
self.expires = datetime.datetime.utcnow() + self.timeout
329
402
self.disable_initiator_tag = (gobject.timeout_add
330
403
(self.timeout_milliseconds(),
332
405
self.enabled = True
406
self.last_enabled = datetime.datetime.utcnow()
333
407
# Also start a new checker *right now*.
334
408
self.start_checker()
562
646
# No such property
563
raise DBusPropertyNotFound(self.dbus_object_path + u":"
564
+ interface_name + u"."
647
raise DBusPropertyNotFound(self.dbus_object_path + ":"
648
+ interface_name + "."
567
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ss",
651
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
569
653
def Get(self, interface_name, property_name):
570
654
"""Standard D-Bus property Get() method, see D-Bus standard.
572
656
prop = self._get_dbus_property(interface_name, property_name)
573
if prop._dbus_access == u"write":
657
if prop._dbus_access == "write":
574
658
raise DBusPropertyAccessException(property_name)
576
if not hasattr(value, u"variant_level"):
660
if not hasattr(value, "variant_level"):
578
662
return type(value)(value, variant_level=value.variant_level+1)
580
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ssv")
664
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
581
665
def Set(self, interface_name, property_name, value):
582
666
"""Standard D-Bus property Set() method, see D-Bus standard.
584
668
prop = self._get_dbus_property(interface_name, property_name)
585
if prop._dbus_access == u"read":
669
if prop._dbus_access == "read":
586
670
raise DBusPropertyAccessException(property_name)
587
if prop._dbus_get_args_options[u"byte_arrays"]:
671
if prop._dbus_get_args_options["byte_arrays"]:
588
672
# The byte_arrays option is not supported yet on
589
673
# signatures other than "ay".
590
if prop._dbus_signature != u"ay":
674
if prop._dbus_signature != "ay":
592
676
value = dbus.ByteArray(''.join(unichr(byte)
593
677
for byte in value))
596
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"s",
597
out_signature=u"a{sv}")
680
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
681
out_signature="a{sv}")
598
682
def GetAll(self, interface_name):
599
683
"""Standard D-Bus property GetAll() method, see D-Bus
631
715
document = xml.dom.minidom.parseString(xmlstring)
632
716
def make_tag(document, name, prop):
633
e = document.createElement(u"property")
634
e.setAttribute(u"name", name)
635
e.setAttribute(u"type", prop._dbus_signature)
636
e.setAttribute(u"access", prop._dbus_access)
717
e = document.createElement("property")
718
e.setAttribute("name", name)
719
e.setAttribute("type", prop._dbus_signature)
720
e.setAttribute("access", prop._dbus_access)
638
for if_tag in document.getElementsByTagName(u"interface"):
722
for if_tag in document.getElementsByTagName("interface"):
639
723
for tag in (make_tag(document, name, prop)
641
725
in self._get_all_dbus_properties()
642
726
if prop._dbus_interface
643
== if_tag.getAttribute(u"name")):
727
== if_tag.getAttribute("name")):
644
728
if_tag.appendChild(tag)
645
729
# Add the names to the return values for the
646
730
# "org.freedesktop.DBus.Properties" methods
647
if (if_tag.getAttribute(u"name")
648
== u"org.freedesktop.DBus.Properties"):
649
for cn in if_tag.getElementsByTagName(u"method"):
650
if cn.getAttribute(u"name") == u"Get":
651
for arg in cn.getElementsByTagName(u"arg"):
652
if (arg.getAttribute(u"direction")
654
arg.setAttribute(u"name", u"value")
655
elif cn.getAttribute(u"name") == u"GetAll":
656
for arg in cn.getElementsByTagName(u"arg"):
657
if (arg.getAttribute(u"direction")
659
arg.setAttribute(u"name", u"props")
660
xmlstring = document.toxml(u"utf-8")
731
if (if_tag.getAttribute("name")
732
== "org.freedesktop.DBus.Properties"):
733
for cn in if_tag.getElementsByTagName("method"):
734
if cn.getAttribute("name") == "Get":
735
for arg in cn.getElementsByTagName("arg"):
736
if (arg.getAttribute("direction")
738
arg.setAttribute("name", "value")
739
elif cn.getAttribute("name") == "GetAll":
740
for arg in cn.getElementsByTagName("arg"):
741
if (arg.getAttribute("direction")
743
arg.setAttribute("name", "props")
744
xmlstring = document.toxml("utf-8")
661
745
document.unlink()
662
746
except (AttributeError, xml.dom.DOMException,
663
xml.parsers.expat.ExpatError), error:
664
logger.error(u"Failed to override Introspection method",
747
xml.parsers.expat.ExpatError) as error:
748
logger.error("Failed to override Introspection method",
753
def datetime_to_dbus (dt, variant_level=0):
754
"""Convert a UTC datetime.datetime() to a D-Bus type."""
756
return dbus.String("", variant_level = variant_level)
757
return dbus.String(dt.isoformat(),
758
variant_level=variant_level)
669
760
class ClientDBus(Client, DBusObjectWithProperties):
670
761
"""A Client class using D-Bus
673
764
dbus_object_path: dbus.ObjectPath
674
765
bus: dbus.SystemBus()
768
runtime_expansions = (Client.runtime_expansions
769
+ ("dbus_object_path",))
676
771
# dbus.service.Object doesn't use super(), so we can't either.
678
773
def __init__(self, bus = None, *args, **kwargs):
774
self._approvals_pending = 0
680
776
Client.__init__(self, *args, **kwargs)
681
777
# Only now, when this client is initialized, can it show up on
779
client_object_name = unicode(self.name).translate(
683
782
self.dbus_object_path = (dbus.ObjectPath
685
+ self.name.replace(u".", u"_")))
783
("/clients/" + client_object_name))
686
784
DBusObjectWithProperties.__init__(self, self.bus,
687
785
self.dbus_object_path)
690
def _datetime_to_dbus(dt, variant_level=0):
691
"""Convert a UTC datetime.datetime() to a D-Bus type."""
692
return dbus.String(dt.isoformat(),
693
variant_level=variant_level)
696
oldstate = getattr(self, u"enabled", False)
697
r = Client.enable(self)
698
if oldstate != self.enabled:
700
self.PropertyChanged(dbus.String(u"enabled"),
701
dbus.Boolean(True, variant_level=1))
702
self.PropertyChanged(
703
dbus.String(u"last_enabled"),
704
self._datetime_to_dbus(self.last_enabled,
708
def disable(self, quiet = False):
709
oldstate = getattr(self, u"enabled", False)
710
r = Client.disable(self, quiet=quiet)
711
if not quiet and oldstate != self.enabled:
713
self.PropertyChanged(dbus.String(u"enabled"),
714
dbus.Boolean(False, variant_level=1))
787
def notifychangeproperty(transform_func,
788
dbus_name, type_func=lambda x: x,
790
""" Modify a variable so that its a property that announce its
792
transform_fun: Function that takes a value and transform it to
794
dbus_name: DBus name of the variable
795
type_func: Function that transform the value before sending it
797
variant_level: DBus variant level. default: 1
800
def setter(self, value):
801
old_value = real_value[0]
802
real_value[0] = value
803
if hasattr(self, "dbus_object_path"):
804
if type_func(old_value) != type_func(real_value[0]):
805
dbus_value = transform_func(type_func(real_value[0]),
807
self.PropertyChanged(dbus.String(dbus_name),
810
return property(lambda self: real_value[0], setter)
813
expires = notifychangeproperty(datetime_to_dbus, "Expires")
814
approvals_pending = notifychangeproperty(dbus.Boolean,
817
enabled = notifychangeproperty(dbus.Boolean, "Enabled")
818
last_enabled = notifychangeproperty(datetime_to_dbus,
820
checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
821
type_func = lambda checker: checker is not None)
822
last_checked_ok = notifychangeproperty(datetime_to_dbus,
824
last_approval_request = notifychangeproperty(datetime_to_dbus,
825
"LastApprovalRequest")
826
approved_by_default = notifychangeproperty(dbus.Boolean,
828
approval_delay = notifychangeproperty(dbus.UInt16, "ApprovalDelay",
829
type_func = _timedelta_to_milliseconds)
830
approval_duration = notifychangeproperty(dbus.UInt16, "ApprovalDuration",
831
type_func = _timedelta_to_milliseconds)
832
host = notifychangeproperty(dbus.String, "Host")
833
timeout = notifychangeproperty(dbus.UInt16, "Timeout",
834
type_func = _timedelta_to_milliseconds)
835
extended_timeout = notifychangeproperty(dbus.UInt16, "ExtendedTimeout",
836
type_func = _timedelta_to_milliseconds)
837
interval = notifychangeproperty(dbus.UInt16, "Interval",
838
type_func = _timedelta_to_milliseconds)
839
checker_command = notifychangeproperty(dbus.String, "Checker")
841
del notifychangeproperty
717
843
def __del__(self, *args, **kwargs):
719
845
self.remove_from_connection()
720
846
except LookupError:
722
if hasattr(DBusObjectWithProperties, u"__del__"):
848
if hasattr(DBusObjectWithProperties, "__del__"):
723
849
DBusObjectWithProperties.__del__(self, *args, **kwargs)
724
850
Client.__del__(self, *args, **kwargs)
766
880
and old_checker_pid != self.checker.pid):
767
881
# Emit D-Bus signal
768
882
self.CheckerStarted(self.current_checker_command)
769
self.PropertyChanged(
770
dbus.String(u"checker_running"),
771
dbus.Boolean(True, variant_level=1))
774
def stop_checker(self, *args, **kwargs):
775
old_checker = getattr(self, u"checker", None)
776
r = Client.stop_checker(self, *args, **kwargs)
777
if (old_checker is not None
778
and getattr(self, u"checker", None) is None):
779
self.PropertyChanged(dbus.String(u"checker_running"),
780
dbus.Boolean(False, variant_level=1))
885
def _reset_approved(self):
886
self._approved = None
889
def approve(self, value=True):
890
self.send_changedstate()
891
self._approved = value
892
gobject.timeout_add(_timedelta_to_milliseconds
893
(self.approval_duration),
894
self._reset_approved)
783
897
## D-Bus methods, signals & properties
784
_interface = u"se.bsnet.fukt.Mandos.Client"
898
_interface = "se.bsnet.fukt.Mandos.Client"
788
902
# CheckerCompleted - signal
789
@dbus.service.signal(_interface, signature=u"nxs")
903
@dbus.service.signal(_interface, signature="nxs")
790
904
def CheckerCompleted(self, exitcode, waitstatus, command):
794
908
# CheckerStarted - signal
795
@dbus.service.signal(_interface, signature=u"s")
909
@dbus.service.signal(_interface, signature="s")
796
910
def CheckerStarted(self, command):
800
914
# PropertyChanged - signal
801
@dbus.service.signal(_interface, signature=u"sv")
915
@dbus.service.signal(_interface, signature="sv")
802
916
def PropertyChanged(self, property, value):
851
@dbus_service_property(_interface, signature=u"s", access=u"read")
852
def name_dbus_property(self):
978
# ApprovalPending - property
979
@dbus_service_property(_interface, signature="b", access="read")
980
def ApprovalPending_dbus_property(self):
981
return dbus.Boolean(bool(self.approvals_pending))
983
# ApprovedByDefault - property
984
@dbus_service_property(_interface, signature="b",
986
def ApprovedByDefault_dbus_property(self, value=None):
987
if value is None: # get
988
return dbus.Boolean(self.approved_by_default)
989
self.approved_by_default = bool(value)
991
# ApprovalDelay - property
992
@dbus_service_property(_interface, signature="t",
994
def ApprovalDelay_dbus_property(self, value=None):
995
if value is None: # get
996
return dbus.UInt64(self.approval_delay_milliseconds())
997
self.approval_delay = datetime.timedelta(0, 0, 0, value)
999
# ApprovalDuration - property
1000
@dbus_service_property(_interface, signature="t",
1002
def ApprovalDuration_dbus_property(self, value=None):
1003
if value is None: # get
1004
return dbus.UInt64(_timedelta_to_milliseconds(
1005
self.approval_duration))
1006
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1009
@dbus_service_property(_interface, signature="s", access="read")
1010
def Name_dbus_property(self):
853
1011
return dbus.String(self.name)
855
# fingerprint - property
856
@dbus_service_property(_interface, signature=u"s", access=u"read")
857
def fingerprint_dbus_property(self):
1013
# Fingerprint - property
1014
@dbus_service_property(_interface, signature="s", access="read")
1015
def Fingerprint_dbus_property(self):
858
1016
return dbus.String(self.fingerprint)
861
@dbus_service_property(_interface, signature=u"s",
863
def host_dbus_property(self, value=None):
1019
@dbus_service_property(_interface, signature="s",
1021
def Host_dbus_property(self, value=None):
864
1022
if value is None: # get
865
1023
return dbus.String(self.host)
866
1024
self.host = value
868
self.PropertyChanged(dbus.String(u"host"),
869
dbus.String(value, variant_level=1))
872
@dbus_service_property(_interface, signature=u"s", access=u"read")
873
def created_dbus_property(self):
874
return dbus.String(self._datetime_to_dbus(self.created))
876
# last_enabled - property
877
@dbus_service_property(_interface, signature=u"s", access=u"read")
878
def last_enabled_dbus_property(self):
879
if self.last_enabled is None:
880
return dbus.String(u"")
881
return dbus.String(self._datetime_to_dbus(self.last_enabled))
884
@dbus_service_property(_interface, signature=u"b",
886
def enabled_dbus_property(self, value=None):
1026
# Created - property
1027
@dbus_service_property(_interface, signature="s", access="read")
1028
def Created_dbus_property(self):
1029
return dbus.String(datetime_to_dbus(self.created))
1031
# LastEnabled - property
1032
@dbus_service_property(_interface, signature="s", access="read")
1033
def LastEnabled_dbus_property(self):
1034
return datetime_to_dbus(self.last_enabled)
1036
# Enabled - property
1037
@dbus_service_property(_interface, signature="b",
1039
def Enabled_dbus_property(self, value=None):
887
1040
if value is None: # get
888
1041
return dbus.Boolean(self.enabled)
894
# last_checked_ok - property
895
@dbus_service_property(_interface, signature=u"s",
897
def last_checked_ok_dbus_property(self, value=None):
1047
# LastCheckedOK - property
1048
@dbus_service_property(_interface, signature="s",
1050
def LastCheckedOK_dbus_property(self, value=None):
898
1051
if value is not None:
899
1052
self.checked_ok()
901
if self.last_checked_ok is None:
902
return dbus.String(u"")
903
return dbus.String(self._datetime_to_dbus(self
907
@dbus_service_property(_interface, signature=u"t",
909
def timeout_dbus_property(self, value=None):
1054
return datetime_to_dbus(self.last_checked_ok)
1056
# Expires - property
1057
@dbus_service_property(_interface, signature="s", access="read")
1058
def Expires_dbus_property(self):
1059
return datetime_to_dbus(self.expires)
1061
# LastApprovalRequest - property
1062
@dbus_service_property(_interface, signature="s", access="read")
1063
def LastApprovalRequest_dbus_property(self):
1064
return datetime_to_dbus(self.last_approval_request)
1066
# Timeout - property
1067
@dbus_service_property(_interface, signature="t",
1069
def Timeout_dbus_property(self, value=None):
910
1070
if value is None: # get
911
1071
return dbus.UInt64(self.timeout_milliseconds())
912
1072
self.timeout = datetime.timedelta(0, 0, 0, value)
914
self.PropertyChanged(dbus.String(u"timeout"),
915
dbus.UInt64(value, variant_level=1))
916
if getattr(self, u"disable_initiator_tag", None) is None:
1073
if getattr(self, "disable_initiator_tag", None) is None:
918
1075
# Reschedule timeout
919
1076
gobject.source_remove(self.disable_initiator_tag)
920
1077
self.disable_initiator_tag = None
921
1079
time_to_die = (self.
922
1080
_timedelta_to_milliseconds((self
923
1081
.last_checked_ok
928
1086
# The timeout has passed
1089
self.expires = (datetime.datetime.utcnow()
1090
+ datetime.timedelta(milliseconds = time_to_die))
931
1091
self.disable_initiator_tag = (gobject.timeout_add
932
1092
(time_to_die, self.disable))
934
# interval - property
935
@dbus_service_property(_interface, signature=u"t",
937
def interval_dbus_property(self, value=None):
1094
# ExtendedTimeout - property
1095
@dbus_service_property(_interface, signature="t",
1097
def ExtendedTimeout_dbus_property(self, value=None):
1098
if value is None: # get
1099
return dbus.UInt64(self.extended_timeout_milliseconds())
1100
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1102
# Interval - property
1103
@dbus_service_property(_interface, signature="t",
1105
def Interval_dbus_property(self, value=None):
938
1106
if value is None: # get
939
1107
return dbus.UInt64(self.interval_milliseconds())
940
1108
self.interval = datetime.timedelta(0, 0, 0, value)
942
self.PropertyChanged(dbus.String(u"interval"),
943
dbus.UInt64(value, variant_level=1))
944
if getattr(self, u"checker_initiator_tag", None) is None:
1109
if getattr(self, "checker_initiator_tag", None) is None:
946
1111
# Reschedule checker run
947
1112
gobject.source_remove(self.checker_initiator_tag)
973
1134
self.stop_checker()
975
# object_path - property
976
@dbus_service_property(_interface, signature=u"o", access=u"read")
977
def object_path_dbus_property(self):
1136
# ObjectPath - property
1137
@dbus_service_property(_interface, signature="o", access="read")
1138
def ObjectPath_dbus_property(self):
978
1139
return self.dbus_object_path # is already a dbus.ObjectPath
981
@dbus_service_property(_interface, signature=u"ay",
982
access=u"write", byte_arrays=True)
983
def secret_dbus_property(self, value):
1142
@dbus_service_property(_interface, signature="ay",
1143
access="write", byte_arrays=True)
1144
def Secret_dbus_property(self, value):
984
1145
self.secret = str(value)
1150
class ProxyClient(object):
1151
def __init__(self, child_pipe, fpr, address):
1152
self._pipe = child_pipe
1153
self._pipe.send(('init', fpr, address))
1154
if not self._pipe.recv():
1157
def __getattribute__(self, name):
1158
if(name == '_pipe'):
1159
return super(ProxyClient, self).__getattribute__(name)
1160
self._pipe.send(('getattr', name))
1161
data = self._pipe.recv()
1162
if data[0] == 'data':
1164
if data[0] == 'function':
1165
def func(*args, **kwargs):
1166
self._pipe.send(('funcall', name, args, kwargs))
1167
return self._pipe.recv()[1]
1170
def __setattr__(self, name, value):
1171
if(name == '_pipe'):
1172
return super(ProxyClient, self).__setattr__(name, value)
1173
self._pipe.send(('setattr', name, value))
989
1176
class ClientHandler(socketserver.BaseRequestHandler, object):
990
1177
"""A class to handle client connections.
993
1180
Note: This will run in its own forked process."""
995
1182
def handle(self):
996
logger.info(u"TCP connection from: %s",
997
unicode(self.client_address))
998
logger.debug(u"IPC Pipe FD: %d",
999
self.server.child_pipe[1].fileno())
1000
# Open IPC pipe to parent process
1001
with contextlib.nested(self.server.child_pipe[1],
1002
self.server.parent_pipe[0]
1003
) as (ipc, ipc_return):
1183
with contextlib.closing(self.server.child_pipe) as child_pipe:
1184
logger.info("TCP connection from: %s",
1185
unicode(self.client_address))
1186
logger.debug("Pipe FD: %d",
1187
self.server.child_pipe.fileno())
1004
1189
session = (gnutls.connection
1005
1190
.ClientSession(self.request,
1006
1191
gnutls.connection
1007
1192
.X509Credentials()))
1009
line = self.request.makefile().readline()
1010
logger.debug(u"Protocol version: %r", line)
1012
if int(line.strip().split()[0]) > 1:
1014
except (ValueError, IndexError, RuntimeError), error:
1015
logger.error(u"Unknown protocol version: %s", error)
1018
1194
# Note: gnutls.connection.X509Credentials is really a
1019
1195
# generic GnuTLS certificate credentials object so long as
1020
1196
# no X.509 keys are added to it. Therefore, we can use it
1021
1197
# here despite using OpenPGP certificates.
1023
#priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
1024
# u"+AES-256-CBC", u"+SHA1",
1025
# u"+COMP-NULL", u"+CTYPE-OPENPGP",
1199
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1200
# "+AES-256-CBC", "+SHA1",
1201
# "+COMP-NULL", "+CTYPE-OPENPGP",
1027
1203
# Use a fallback default, since this MUST be set.
1028
1204
priority = self.server.gnutls_priority
1029
1205
if priority is None:
1030
priority = u"NORMAL"
1031
1207
(gnutls.library.functions
1032
1208
.gnutls_priority_set_direct(session._c_object,
1033
1209
priority, None))
1211
# Start communication using the Mandos protocol
1212
# Get protocol number
1213
line = self.request.makefile().readline()
1214
logger.debug("Protocol version: %r", line)
1216
if int(line.strip().split()[0]) > 1:
1218
except (ValueError, IndexError, RuntimeError) as error:
1219
logger.error("Unknown protocol version: %s", error)
1222
# Start GnuTLS connection
1036
1224
session.handshake()
1037
except gnutls.errors.GNUTLSError, error:
1038
logger.warning(u"Handshake failed: %s", error)
1225
except gnutls.errors.GNUTLSError as error:
1226
logger.warning("Handshake failed: %s", error)
1039
1227
# Do not run session.bye() here: the session is not
1040
1228
# established. Just abandon the request.
1042
logger.debug(u"Handshake succeeded")
1230
logger.debug("Handshake succeeded")
1232
approval_required = False
1045
1235
fpr = self.fingerprint(self.peer_certificate
1047
except (TypeError, gnutls.errors.GNUTLSError), error:
1048
logger.warning(u"Bad certificate: %s", error)
1238
gnutls.errors.GNUTLSError) as error:
1239
logger.warning("Bad certificate: %s", error)
1050
logger.debug(u"Fingerprint: %s", fpr)
1241
logger.debug("Fingerprint: %s", fpr)
1052
for c in self.server.clients:
1053
if c.fingerprint == fpr:
1244
client = ProxyClient(child_pipe, fpr,
1245
self.client_address)
1249
if client.approval_delay:
1250
delay = client.approval_delay
1251
client.approvals_pending += 1
1252
approval_required = True
1255
if not client.enabled:
1256
logger.info("Client %s is disabled",
1258
if self.server.use_dbus:
1260
client.Rejected("Disabled")
1263
if client._approved or not client.approval_delay:
1264
#We are approved or approval is disabled
1057
ipc.write(u"NOTFOUND %s %s\n"
1058
% (fpr, unicode(self.client_address)))
1060
# Have to check if client.enabled, since it is
1061
# possible that the client was disabled since the
1062
# GnuTLS session was established.
1063
ipc.write(u"GETATTR enabled %s\n" % fpr)
1064
enabled = pickle.load(ipc_return)
1066
ipc.write(u"DISABLED %s\n" % client.name)
1068
# Send "NEED_APPROVAL" here and hang waiting
1069
# for response? Leave timeout to parent process?
1070
ipc.write(u"SENDING %s\n" % client.name)
1266
elif client._approved is None:
1267
logger.info("Client %s needs approval",
1269
if self.server.use_dbus:
1271
client.NeedApproval(
1272
client.approval_delay_milliseconds(),
1273
client.approved_by_default)
1275
logger.warning("Client %s was not approved",
1277
if self.server.use_dbus:
1279
client.Rejected("Denied")
1282
#wait until timeout or approved
1283
#x = float(client._timedelta_to_milliseconds(delay))
1284
time = datetime.datetime.now()
1285
client.changedstate.acquire()
1286
client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
1287
client.changedstate.release()
1288
time2 = datetime.datetime.now()
1289
if (time2 - time) >= delay:
1290
if not client.approved_by_default:
1291
logger.warning("Client %s timed out while"
1292
" waiting for approval",
1294
if self.server.use_dbus:
1296
client.Rejected("Approval timed out")
1301
delay -= time2 - time
1072
1304
while sent_size < len(client.secret):
1073
sent = session.send(client.secret[sent_size:])
1074
logger.debug(u"Sent: %d, remaining: %d",
1306
sent = session.send(client.secret[sent_size:])
1307
except gnutls.errors.GNUTLSError as error:
1308
logger.warning("gnutls send failed")
1310
logger.debug("Sent: %d, remaining: %d",
1075
1311
sent, len(client.secret)
1076
1312
- (sent_size + sent))
1077
1313
sent_size += sent
1315
logger.info("Sending secret to %s", client.name)
1316
# bump the timeout as if seen
1317
client.checked_ok(client.extended_timeout)
1318
if self.server.use_dbus:
1323
if approval_required:
1324
client.approvals_pending -= 1
1327
except gnutls.errors.GNUTLSError as error:
1328
logger.warning("GnuTLS bye failed")
1082
1331
def peer_certificate(session):
1138
1387
# Convert the buffer to a Python bytestring
1139
1388
fpr = ctypes.string_at(buf, buf_len.value)
1140
1389
# Convert the bytestring to hexadecimal notation
1141
hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
1390
hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
1145
class ForkingMixInWithPipes(socketserver.ForkingMixIn, object):
1146
"""Like socketserver.ForkingMixIn, but also pass a pipe pair."""
1394
class MultiprocessingMixIn(object):
1395
"""Like socketserver.ThreadingMixIn, but with multiprocessing"""
1396
def sub_process_main(self, request, address):
1398
self.finish_request(request, address)
1400
self.handle_error(request, address)
1401
self.close_request(request)
1403
def process_request(self, request, address):
1404
"""Start a new process to process the request."""
1405
multiprocessing.Process(target = self.sub_process_main,
1406
args = (request, address)).start()
1408
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1409
""" adds a pipe to the MixIn """
1147
1410
def process_request(self, request, client_address):
1148
1411
"""Overrides and wraps the original process_request().
1150
1413
This function creates a new pipe in self.pipe
1152
# Child writes to child_pipe
1153
self.child_pipe = map(os.fdopen, os.pipe(), u"rw", (1, 0))
1154
# Parent writes to parent_pipe
1155
self.parent_pipe = map(os.fdopen, os.pipe(), u"rw", (1, 0))
1156
super(ForkingMixInWithPipes,
1415
parent_pipe, self.child_pipe = multiprocessing.Pipe()
1417
super(MultiprocessingMixInWithPipe,
1157
1418
self).process_request(request, client_address)
1158
# Close unused ends for parent
1159
self.parent_pipe[0].close() # close read end
1160
self.child_pipe[1].close() # close write end
1161
self.add_pipe_fds(self.child_pipe[0], self.parent_pipe[1])
1162
def add_pipe_fds(self, child_pipe_fd, parent_pipe_fd):
1419
self.child_pipe.close()
1420
self.add_pipe(parent_pipe)
1422
def add_pipe(self, parent_pipe):
1163
1423
"""Dummy function; override as necessary"""
1164
child_pipe_fd.close()
1165
parent_pipe_fd.close()
1168
class IPv6_TCPServer(ForkingMixInWithPipes,
1424
raise NotImplementedError
1426
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1169
1427
socketserver.TCPServer, object):
1170
1428
"""IPv6-capable TCP server. Accepts 'None' as address and/or port
1256
1514
return socketserver.TCPServer.server_activate(self)
1257
1515
def enable(self):
1258
1516
self.enabled = True
1259
def add_pipe_fds(self, child_pipe_fd, parent_pipe_fd):
1517
def add_pipe(self, parent_pipe):
1260
1518
# Call "handle_ipc" for both data and EOF events
1261
gobject.io_add_watch(child_pipe_fd.fileno(),
1519
gobject.io_add_watch(parent_pipe.fileno(),
1262
1520
gobject.IO_IN | gobject.IO_HUP,
1263
1521
functools.partial(self.handle_ipc,
1264
reply = parent_pipe_fd,
1265
sender= child_pipe_fd))
1266
def handle_ipc(self, source, condition, reply=None, sender=None):
1522
parent_pipe = parent_pipe))
1524
def handle_ipc(self, source, condition, parent_pipe=None,
1525
client_object=None):
1267
1526
condition_names = {
1268
gobject.IO_IN: u"IN", # There is data to read.
1269
gobject.IO_OUT: u"OUT", # Data can be written (without
1527
gobject.IO_IN: "IN", # There is data to read.
1528
gobject.IO_OUT: "OUT", # Data can be written (without
1271
gobject.IO_PRI: u"PRI", # There is urgent data to read.
1272
gobject.IO_ERR: u"ERR", # Error condition.
1273
gobject.IO_HUP: u"HUP" # Hung up (the connection has been
1530
gobject.IO_PRI: "PRI", # There is urgent data to read.
1531
gobject.IO_ERR: "ERR", # Error condition.
1532
gobject.IO_HUP: "HUP" # Hung up (the connection has been
1274
1533
# broken, usually for pipes and
1278
1537
for cond, name in
1279
1538
condition_names.iteritems()
1280
1539
if cond & condition)
1281
logger.debug(u"Handling IPC: FD = %d, condition = %s", source,
1284
# Read a line from the file object
1285
cmdline = sender.readline()
1286
if not cmdline: # Empty line means end of file
1287
# close the IPC pipes
1291
# Stop calling this function
1294
logger.debug(u"IPC command: %r", cmdline)
1296
# Parse and act on command
1297
cmd, args = cmdline.rstrip(u"\r\n").split(None, 1)
1299
if cmd == u"NOTFOUND":
1300
fpr, address = args.split(None, 1)
1301
logger.warning(u"Client not found for fingerprint: %s, ad"
1302
u"dress: %s", fpr, address)
1305
mandos_dbus_service.ClientNotFound(fpr, address)
1306
elif cmd == u"DISABLED":
1307
for client in self.clients:
1308
if client.name == args:
1309
logger.warning(u"Client %s is disabled", args)
1315
logger.error(u"Unknown client %s is disabled", args)
1316
elif cmd == u"SENDING":
1317
for client in self.clients:
1318
if client.name == args:
1319
logger.info(u"Sending secret to %s", client.name)
1326
logger.error(u"Sending secret to unknown client %s",
1328
elif cmd == u"GETATTR":
1329
attr_name, fpr = args.split(None, 1)
1330
for client in self.clients:
1331
if client.fingerprint == fpr:
1332
attr_value = getattr(client, attr_name, None)
1333
logger.debug("IPC reply: %r", attr_value)
1334
pickle.dump(attr_value, reply)
1337
logger.error(u"Client %s on address %s requesting "
1338
u"attribute %s not found", fpr, address,
1340
pickle.dump(None, reply)
1342
logger.error(u"Unknown IPC command: %r", cmdline)
1344
# Keep calling this function
1540
# error or the other end of multiprocessing.Pipe has closed
1541
if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
1544
# Read a request from the child
1545
request = parent_pipe.recv()
1546
command = request[0]
1548
if command == 'init':
1550
address = request[2]
1552
for c in self.clients:
1553
if c.fingerprint == fpr:
1557
logger.info("Client not found for fingerprint: %s, ad"
1558
"dress: %s", fpr, address)
1561
mandos_dbus_service.ClientNotFound(fpr, address[0])
1562
parent_pipe.send(False)
1565
gobject.io_add_watch(parent_pipe.fileno(),
1566
gobject.IO_IN | gobject.IO_HUP,
1567
functools.partial(self.handle_ipc,
1568
parent_pipe = parent_pipe,
1569
client_object = client))
1570
parent_pipe.send(True)
1571
# remove the old hook in favor of the new above hook on same fileno
1573
if command == 'funcall':
1574
funcname = request[1]
1578
parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
1580
if command == 'getattr':
1581
attrname = request[1]
1582
if callable(client_object.__getattribute__(attrname)):
1583
parent_pipe.send(('function',))
1585
parent_pipe.send(('data', client_object.__getattribute__(attrname)))
1587
if command == 'setattr':
1588
attrname = request[1]
1590
setattr(client_object, attrname, value)
1348
1595
def string_to_delta(interval):
1349
1596
"""Parse a string and return a datetime.timedelta
1351
>>> string_to_delta(u'7d')
1598
>>> string_to_delta('7d')
1352
1599
datetime.timedelta(7)
1353
>>> string_to_delta(u'60s')
1600
>>> string_to_delta('60s')
1354
1601
datetime.timedelta(0, 60)
1355
>>> string_to_delta(u'60m')
1602
>>> string_to_delta('60m')
1356
1603
datetime.timedelta(0, 3600)
1357
>>> string_to_delta(u'24h')
1604
>>> string_to_delta('24h')
1358
1605
datetime.timedelta(1)
1359
>>> string_to_delta(u'1w')
1606
>>> string_to_delta('1w')
1360
1607
datetime.timedelta(7)
1361
>>> string_to_delta(u'5m 30s')
1608
>>> string_to_delta('5m 30s')
1362
1609
datetime.timedelta(0, 330)
1364
1611
timevalue = datetime.timedelta(0)
1438
1685
##################################################################
1439
1686
# Parsing of options, both command line and config file
1441
parser = optparse.OptionParser(version = "%%prog %s" % version)
1442
parser.add_option("-i", u"--interface", type=u"string",
1443
metavar="IF", help=u"Bind to interface IF")
1444
parser.add_option("-a", u"--address", type=u"string",
1445
help=u"Address to listen for requests on")
1446
parser.add_option("-p", u"--port", type=u"int",
1447
help=u"Port number to receive requests on")
1448
parser.add_option("--check", action=u"store_true",
1449
help=u"Run self-test")
1450
parser.add_option("--debug", action=u"store_true",
1451
help=u"Debug mode; run in foreground and log to"
1453
parser.add_option("--priority", type=u"string", help=u"GnuTLS"
1454
u" priority string (see GnuTLS documentation)")
1455
parser.add_option("--servicename", type=u"string",
1456
metavar=u"NAME", help=u"Zeroconf service name")
1457
parser.add_option("--configdir", type=u"string",
1458
default=u"/etc/mandos", metavar=u"DIR",
1459
help=u"Directory to search for configuration"
1461
parser.add_option("--no-dbus", action=u"store_false",
1462
dest=u"use_dbus", help=u"Do not provide D-Bus"
1463
u" system bus interface")
1464
parser.add_option("--no-ipv6", action=u"store_false",
1465
dest=u"use_ipv6", help=u"Do not use IPv6")
1466
options = parser.parse_args()[0]
1688
parser = argparse.ArgumentParser()
1689
parser.add_argument("-v", "--version", action="version",
1690
version = "%%(prog)s %s" % version,
1691
help="show version number and exit")
1692
parser.add_argument("-i", "--interface", metavar="IF",
1693
help="Bind to interface IF")
1694
parser.add_argument("-a", "--address",
1695
help="Address to listen for requests on")
1696
parser.add_argument("-p", "--port", type=int,
1697
help="Port number to receive requests on")
1698
parser.add_argument("--check", action="store_true",
1699
help="Run self-test")
1700
parser.add_argument("--debug", action="store_true",
1701
help="Debug mode; run in foreground and log"
1703
parser.add_argument("--debuglevel", metavar="LEVEL",
1704
help="Debug level for stdout output")
1705
parser.add_argument("--priority", help="GnuTLS"
1706
" priority string (see GnuTLS documentation)")
1707
parser.add_argument("--servicename",
1708
metavar="NAME", help="Zeroconf service name")
1709
parser.add_argument("--configdir",
1710
default="/etc/mandos", metavar="DIR",
1711
help="Directory to search for configuration"
1713
parser.add_argument("--no-dbus", action="store_false",
1714
dest="use_dbus", help="Do not provide D-Bus"
1715
" system bus interface")
1716
parser.add_argument("--no-ipv6", action="store_false",
1717
dest="use_ipv6", help="Do not use IPv6")
1718
options = parser.parse_args()
1468
1720
if options.check:
1473
1725
# Default values for config file for server-global settings
1474
server_defaults = { u"interface": u"",
1479
u"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1480
u"servicename": u"Mandos",
1481
u"use_dbus": u"True",
1482
u"use_ipv6": u"True",
1726
server_defaults = { "interface": "",
1731
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1732
"servicename": "Mandos",
1485
1738
# Parse config file for server-global settings
1486
1739
server_config = configparser.SafeConfigParser(server_defaults)
1487
1740
del server_defaults
1488
1741
server_config.read(os.path.join(options.configdir,
1490
1743
# Convert the SafeConfigParser object to a dict
1491
1744
server_settings = server_config.defaults()
1492
1745
# Use the appropriate methods on the non-string config options
1493
for option in (u"debug", u"use_dbus", u"use_ipv6"):
1494
server_settings[option] = server_config.getboolean(u"DEFAULT",
1746
for option in ("debug", "use_dbus", "use_ipv6"):
1747
server_settings[option] = server_config.getboolean("DEFAULT",
1496
1749
if server_settings["port"]:
1497
server_settings["port"] = server_config.getint(u"DEFAULT",
1750
server_settings["port"] = server_config.getint("DEFAULT",
1499
1752
del server_config
1501
1754
# Override the settings from the config file with command line
1502
1755
# options, if set.
1503
for option in (u"interface", u"address", u"port", u"debug",
1504
u"priority", u"servicename", u"configdir",
1505
u"use_dbus", u"use_ipv6"):
1756
for option in ("interface", "address", "port", "debug",
1757
"priority", "servicename", "configdir",
1758
"use_dbus", "use_ipv6", "debuglevel"):
1506
1759
value = getattr(options, option)
1507
1760
if value is not None:
1508
1761
server_settings[option] = value
1516
1769
##################################################################
1518
1771
# For convenience
1519
debug = server_settings[u"debug"]
1520
use_dbus = server_settings[u"use_dbus"]
1521
use_ipv6 = server_settings[u"use_ipv6"]
1524
syslogger.setLevel(logging.WARNING)
1525
console.setLevel(logging.WARNING)
1527
if server_settings[u"servicename"] != u"Mandos":
1772
debug = server_settings["debug"]
1773
debuglevel = server_settings["debuglevel"]
1774
use_dbus = server_settings["use_dbus"]
1775
use_ipv6 = server_settings["use_ipv6"]
1777
if server_settings["servicename"] != "Mandos":
1528
1778
syslogger.setFormatter(logging.Formatter
1529
(u'Mandos (%s) [%%(process)d]:'
1530
u' %%(levelname)s: %%(message)s'
1531
% server_settings[u"servicename"]))
1779
('Mandos (%s) [%%(process)d]:'
1780
' %%(levelname)s: %%(message)s'
1781
% server_settings["servicename"]))
1533
1783
# Parse config file with clients
1534
client_defaults = { u"timeout": u"1h",
1536
u"checker": u"fping -q -- %%(host)s",
1784
client_defaults = { "timeout": "5m",
1785
"extended_timeout": "15m",
1787
"checker": "fping -q -- %%(host)s",
1789
"approval_delay": "0s",
1790
"approval_duration": "1s",
1539
1792
client_config = configparser.SafeConfigParser(client_defaults)
1540
client_config.read(os.path.join(server_settings[u"configdir"],
1793
client_config.read(os.path.join(server_settings["configdir"],
1543
1796
global mandos_dbus_service
1544
1797
mandos_dbus_service = None
1546
tcp_server = MandosServer((server_settings[u"address"],
1547
server_settings[u"port"]),
1799
tcp_server = MandosServer((server_settings["address"],
1800
server_settings["port"]),
1549
interface=server_settings[u"interface"],
1802
interface=(server_settings["interface"]
1550
1804
use_ipv6=use_ipv6,
1551
1805
gnutls_priority=
1552
server_settings[u"priority"],
1806
server_settings["priority"],
1553
1807
use_dbus=use_dbus)
1554
pidfilename = u"/var/run/mandos.pid"
1556
pidfile = open(pidfilename, u"w")
1558
logger.error(u"Could not open file %r", pidfilename)
1809
pidfilename = "/var/run/mandos.pid"
1811
pidfile = open(pidfilename, "w")
1813
logger.error("Could not open file %r", pidfilename)
1561
uid = pwd.getpwnam(u"_mandos").pw_uid
1562
gid = pwd.getpwnam(u"_mandos").pw_gid
1816
uid = pwd.getpwnam("_mandos").pw_uid
1817
gid = pwd.getpwnam("_mandos").pw_gid
1563
1818
except KeyError:
1565
uid = pwd.getpwnam(u"mandos").pw_uid
1566
gid = pwd.getpwnam(u"mandos").pw_gid
1820
uid = pwd.getpwnam("mandos").pw_uid
1821
gid = pwd.getpwnam("mandos").pw_gid
1567
1822
except KeyError:
1569
uid = pwd.getpwnam(u"nobody").pw_uid
1570
gid = pwd.getpwnam(u"nobody").pw_gid
1824
uid = pwd.getpwnam("nobody").pw_uid
1825
gid = pwd.getpwnam("nobody").pw_gid
1571
1826
except KeyError:
1577
except OSError, error:
1832
except OSError as error:
1578
1833
if error[0] != errno.EPERM:
1581
# Enable all possible GnuTLS debugging
1836
if not debug and not debuglevel:
1837
syslogger.setLevel(logging.WARNING)
1838
console.setLevel(logging.WARNING)
1840
level = getattr(logging, debuglevel.upper())
1841
syslogger.setLevel(level)
1842
console.setLevel(level)
1845
# Enable all possible GnuTLS debugging
1583
1847
# "Use a log level over 10 to enable all debugging options."
1584
1848
# - GnuTLS manual
1585
1849
gnutls.library.functions.gnutls_global_set_log_level(11)
1587
1851
@gnutls.library.types.gnutls_log_func
1588
1852
def debug_gnutls(level, string):
1589
logger.debug(u"GnuTLS: %s", string[:-1])
1853
logger.debug("GnuTLS: %s", string[:-1])
1591
1855
(gnutls.library.functions
1592
1856
.gnutls_global_set_log_function(debug_gnutls))
1858
# Redirect stdin so all checkers get /dev/null
1859
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1860
os.dup2(null, sys.stdin.fileno())
1864
# No console logging
1865
logger.removeHandler(console)
1867
# Need to fork before connecting to D-Bus
1869
# Close all input and output, do double fork, etc.
1594
1872
global main_loop
1595
1873
# From the Avahi example code
1599
1877
# End of Avahi example code
1602
bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos",
1880
bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
1603
1881
bus, do_not_queue=True)
1604
except dbus.exceptions.NameExistsException, e:
1605
logger.error(unicode(e) + u", disabling D-Bus")
1882
except dbus.exceptions.NameExistsException as e:
1883
logger.error(unicode(e) + ", disabling D-Bus")
1606
1884
use_dbus = False
1607
server_settings[u"use_dbus"] = False
1885
server_settings["use_dbus"] = False
1608
1886
tcp_server.use_dbus = False
1609
1887
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1610
service = AvahiService(name = server_settings[u"servicename"],
1611
servicetype = u"_mandos._tcp",
1888
service = AvahiService(name = server_settings["servicename"],
1889
servicetype = "_mandos._tcp",
1612
1890
protocol = protocol, bus = bus)
1613
1891
if server_settings["interface"]:
1614
1892
service.interface = (if_nametoindex
1615
(str(server_settings[u"interface"])))
1893
(str(server_settings["interface"])))
1895
global multiprocessing_manager
1896
multiprocessing_manager = multiprocessing.Manager()
1617
1898
client_class = Client
1619
1900
client_class = functools.partial(ClientDBus, bus = bus)
1901
def client_config_items(config, section):
1902
special_settings = {
1903
"approved_by_default":
1904
lambda: config.getboolean(section,
1905
"approved_by_default"),
1907
for name, value in config.items(section):
1909
yield (name, special_settings[name]())
1620
1913
tcp_server.clients.update(set(
1621
1914
client_class(name = section,
1622
config= dict(client_config.items(section)))
1915
config= dict(client_config_items(
1916
client_config, section)))
1623
1917
for section in client_config.sections()))
1624
1918
if not tcp_server.clients:
1625
logger.warning(u"No clients defined")
1628
# Redirect stdin so all checkers get /dev/null
1629
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1630
os.dup2(null, sys.stdin.fileno())
1634
# No console logging
1635
logger.removeHandler(console)
1636
# Close all input and output, do double fork, etc.
1642
pidfile.write(str(pid) + "\n")
1645
logger.error(u"Could not write to file %r with PID %d",
1648
# "pidfile" was never created
1919
logger.warning("No clients defined")
1925
pidfile.write(str(pid) + "\n".encode("utf-8"))
1928
logger.error("Could not write to file %r with PID %d",
1931
# "pidfile" was never created
1653
1935
signal.signal(signal.SIGINT, signal.SIG_IGN)
1654
1937
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1655
1938
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
1658
1941
class MandosDBusService(dbus.service.Object):
1659
1942
"""A D-Bus proxy object"""
1660
1943
def __init__(self):
1661
dbus.service.Object.__init__(self, bus, u"/")
1662
_interface = u"se.bsnet.fukt.Mandos"
1944
dbus.service.Object.__init__(self, bus, "/")
1945
_interface = "se.bsnet.fukt.Mandos"
1664
@dbus.service.signal(_interface, signature=u"o")
1947
@dbus.service.signal(_interface, signature="o")
1665
1948
def ClientAdded(self, objpath):
1669
@dbus.service.signal(_interface, signature=u"ss")
1952
@dbus.service.signal(_interface, signature="ss")
1670
1953
def ClientNotFound(self, fingerprint, address):
1674
@dbus.service.signal(_interface, signature=u"os")
1957
@dbus.service.signal(_interface, signature="os")
1675
1958
def ClientRemoved(self, objpath, name):
1679
@dbus.service.method(_interface, out_signature=u"ao")
1962
@dbus.service.method(_interface, out_signature="ao")
1680
1963
def GetAllClients(self):
1682
1965
return dbus.Array(c.dbus_object_path
1683
1966
for c in tcp_server.clients)
1685
1968
@dbus.service.method(_interface,
1686
out_signature=u"a{oa{sv}}")
1969
out_signature="a{oa{sv}}")
1687
1970
def GetAllClientsWithProperties(self):
1689
1972
return dbus.Dictionary(
1690
((c.dbus_object_path, c.GetAll(u""))
1973
((c.dbus_object_path, c.GetAll(""))
1691
1974
for c in tcp_server.clients),
1692
signature=u"oa{sv}")
1694
@dbus.service.method(_interface, in_signature=u"o")
1977
@dbus.service.method(_interface, in_signature="o")
1695
1978
def RemoveClient(self, object_path):
1697
1980
for c in tcp_server.clients: