151
151
self.group = None # our entry group
152
152
self.server = None
154
self.entry_group_state_changed_match = None
154
155
def rename(self):
155
156
"""Derived from the Avahi example code"""
156
157
if self.rename_count >= self.max_renames:
157
logger.critical(u"No suitable Zeroconf service name found"
158
u" after %i retries, exiting.",
158
logger.critical("No suitable Zeroconf service name found"
159
" after %i retries, exiting.",
159
160
self.rename_count)
160
raise AvahiServiceError(u"Too many renames")
161
self.name = self.server.GetAlternativeServiceName(self.name)
162
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 ...",
164
165
syslogger.setFormatter(logging.Formatter
165
(u'Mandos (%s) [%%(process)d]:'
166
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)
170
176
self.rename_count += 1
171
177
def remove(self):
172
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
173
182
if self.group is not None:
174
183
self.group.Reset()
176
185
"""Derived from the Avahi example code"""
177
187
if self.group is None:
178
188
self.group = dbus.Interface(
179
189
self.bus.get_object(avahi.DBUS_NAME,
180
190
self.server.EntryGroupNew()),
181
191
avahi.DBUS_INTERFACE_ENTRY_GROUP)
182
self.group.connect_to_signal('StateChanged',
184
.entry_group_state_changed)
185
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' ...",
186
196
self.name, self.type)
187
197
self.group.AddService(
195
205
self.group.Commit()
196
206
def entry_group_state_changed(self, state, error):
197
207
"""Derived from the Avahi example code"""
198
logger.debug(u"Avahi state change: %i", state)
208
logger.debug("Avahi entry group state change: %i", state)
200
210
if state == avahi.ENTRY_GROUP_ESTABLISHED:
201
logger.debug(u"Zeroconf service established.")
211
logger.debug("Zeroconf service established.")
202
212
elif state == avahi.ENTRY_GROUP_COLLISION:
203
logger.warning(u"Zeroconf service name collision.")
213
logger.info("Zeroconf service name collision.")
205
215
elif state == avahi.ENTRY_GROUP_FAILURE:
206
logger.critical(u"Avahi: Error in group state changed %s",
216
logger.critical("Avahi: Error in group state changed %s",
208
raise AvahiGroupError(u"State changed: %s"
218
raise AvahiGroupError("State changed: %s"
209
219
% unicode(error))
210
220
def cleanup(self):
211
221
"""Derived from the Avahi example code"""
212
222
if self.group is not None:
225
except (dbus.exceptions.UnknownMethodException,
226
dbus.exceptions.DBusException) as e:
214
228
self.group = None
215
def server_state_changed(self, state):
230
def server_state_changed(self, state, error=None):
216
231
"""Derived from the Avahi example code"""
217
if state == avahi.SERVER_COLLISION:
218
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)
220
247
elif state == avahi.SERVER_RUNNING:
251
logger.debug("Unknown state: %r", state)
253
logger.debug("Unknown state: %r: %r", state, error)
222
254
def activate(self):
223
255
"""Derived from the Avahi example code"""
224
256
if self.server is None:
225
257
self.server = dbus.Interface(
226
258
self.bus.get_object(avahi.DBUS_NAME,
227
avahi.DBUS_PATH_SERVER),
259
avahi.DBUS_PATH_SERVER,
260
follow_name_owner_changes=True),
228
261
avahi.DBUS_INTERFACE_SERVER)
229
self.server.connect_to_signal(u"StateChanged",
262
self.server.connect_to_signal("StateChanged",
230
263
self.server_state_changed)
231
264
self.server_state_changed(self.server.GetState())
235
# approved_by_default (Config option for each client)
236
# approved_delay (config option for each client)
237
# approved_duration (config option for each client)
238
267
class Client(object):
239
268
"""A representation of a client host served by this server.
242
name: string; from the config file, used in log messages and
271
_approved: bool(); 'None' if not yet approved/disapproved
272
approval_delay: datetime.timedelta(); Time to wait for approval
273
approval_duration: datetime.timedelta(); Duration of one approval
274
checker: subprocess.Popen(); a running checker process used
275
to see if the client lives.
276
'None' if no process is running.
277
checker_callback_tag: a gobject event source tag, or None
278
checker_command: string; External command which is run to check
279
if client lives. %() expansions are done at
280
runtime with vars(self) as dict, so that for
281
instance %(name)s can be used in the command.
282
checker_initiator_tag: a gobject event source tag, or None
283
created: datetime.datetime(); (UTC) object creation
284
current_checker_command: string; current running checker_command
285
disable_hook: If set, called by disable() as disable_hook(self)
286
disable_initiator_tag: a gobject event source tag, or None
244
288
fingerprint: string (40 or 32 hexadecimal digits); used to
245
289
uniquely identify the client
246
secret: bytestring; sent verbatim (over TLS) to client
247
290
host: string; available for use by the checker command
248
created: datetime.datetime(); (UTC) object creation
291
interval: datetime.timedelta(); How often to start a new checker
292
last_approval_request: datetime.datetime(); (UTC) or None
293
last_checked_ok: datetime.datetime(); (UTC) or None
249
294
last_enabled: datetime.datetime(); (UTC)
251
last_checked_ok: datetime.datetime(); (UTC) or None
295
name: string; from the config file, used in log messages and
297
secret: bytestring; sent verbatim (over TLS) to client
252
298
timeout: datetime.timedelta(); How long from last_checked_ok
253
299
until this client is disabled
254
interval: datetime.timedelta(); How often to start a new checker
255
disable_hook: If set, called by disable() as disable_hook(self)
256
checker: subprocess.Popen(); a running checker process used
257
to see if the client lives.
258
'None' if no process is running.
259
checker_initiator_tag: a gobject event source tag, or None
260
disable_initiator_tag: - '' -
261
checker_callback_tag: - '' -
262
checker_command: string; External command which is run to check if
263
client lives. %() expansions are done at
264
runtime with vars(self) as dict, so that for
265
instance %(name)s can be used in the command.
266
current_checker_command: string; current running checker_command
267
approved_delay: datetime.timedelta(); Time to wait for approval
268
_approved: bool(); 'None' if not yet approved/disapproved
269
approved_duration: datetime.timedelta(); Duration of one approval
300
runtime_expansions: Allowed attributes for runtime expansion.
303
runtime_expansions = ("approval_delay", "approval_duration",
304
"created", "enabled", "fingerprint",
305
"host", "interval", "last_checked_ok",
306
"last_enabled", "name", "timeout")
273
309
def _timedelta_to_milliseconds(td):
274
310
"Convert a datetime.timedelta() to milliseconds"
295
331
if config is None:
297
logger.debug(u"Creating client %r", self.name)
333
logger.debug("Creating client %r", self.name)
298
334
# Uppercase and remove spaces from fingerprint for later
299
335
# comparison purposes with return value from the fingerprint()
301
self.fingerprint = (config[u"fingerprint"].upper()
303
logger.debug(u" Fingerprint: %s", self.fingerprint)
304
if u"secret" in config:
305
self.secret = config[u"secret"].decode(u"base64")
306
elif u"secfile" in config:
337
self.fingerprint = (config["fingerprint"].upper()
339
logger.debug(" Fingerprint: %s", self.fingerprint)
340
if "secret" in config:
341
self.secret = config["secret"].decode("base64")
342
elif "secfile" in config:
307
343
with open(os.path.expanduser(os.path.expandvars
308
(config[u"secfile"])),
344
(config["secfile"])),
309
345
"rb") as secfile:
310
346
self.secret = secfile.read()
312
#XXX Need to allow secret on demand!
313
raise TypeError(u"No secret or secfile for client %s"
348
raise TypeError("No secret or secfile for client %s"
315
self.host = config.get(u"host", u"")
350
self.host = config.get("host", "")
316
351
self.created = datetime.datetime.utcnow()
317
352
self.enabled = False
353
self.last_approval_request = None
318
354
self.last_enabled = None
319
355
self.last_checked_ok = None
320
self.timeout = string_to_delta(config[u"timeout"])
321
self.interval = string_to_delta(config[u"interval"])
356
self.timeout = string_to_delta(config["timeout"])
357
self.interval = string_to_delta(config["interval"])
322
358
self.disable_hook = disable_hook
323
359
self.checker = None
324
360
self.checker_initiator_tag = None
325
361
self.disable_initiator_tag = None
326
362
self.checker_callback_tag = None
327
self.checker_command = config[u"checker"]
363
self.checker_command = config["checker"]
328
364
self.current_checker_command = None
329
365
self.last_connect = None
330
366
self._approved = None
331
self.approved_by_default = config.get(u"approved_by_default",
333
self.approved_delay = string_to_delta(
334
config[u"approved_delay"])
335
self.approved_duration = string_to_delta(
336
config[u"approved_duration"])
367
self.approved_by_default = config.get("approved_by_default",
369
self.approvals_pending = 0
370
self.approval_delay = string_to_delta(
371
config["approval_delay"])
372
self.approval_duration = string_to_delta(
373
config["approval_duration"])
337
374
self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
339
376
def send_changedstate(self):
340
377
self.changedstate.acquire()
341
378
self.changedstate.notify_all()
449
489
command = self.checker_command % self.host
450
490
except TypeError:
451
491
# Escape attributes for the shell
452
escaped_attrs = dict((key,
453
re.escape(unicode(str(val),
457
vars(self).iteritems())
492
escaped_attrs = dict(
494
re.escape(unicode(str(getattr(self, attr, "")),
498
self.runtime_expansions)
459
501
command = self.checker_command % escaped_attrs
460
except TypeError, error:
461
logger.error(u'Could not format string "%s":'
462
u' %s', self.checker_command, error)
502
except TypeError as error:
503
logger.error('Could not format string "%s":'
504
' %s', self.checker_command, error)
463
505
return True # Try again later
464
506
self.current_checker_command = command
466
logger.info(u"Starting checker %r for %s",
508
logger.info("Starting checker %r for %s",
467
509
command, self.name)
468
510
# We don't need to redirect stdout and stderr, since
469
511
# in normal mode, that is already done by daemon(),
493
535
if self.checker_callback_tag:
494
536
gobject.source_remove(self.checker_callback_tag)
495
537
self.checker_callback_tag = None
496
if getattr(self, u"checker", None) is None:
538
if getattr(self, "checker", None) is None:
498
logger.debug(u"Stopping checker for %(name)s", vars(self))
540
logger.debug("Stopping checker for %(name)s", vars(self))
500
542
os.kill(self.checker.pid, signal.SIGTERM)
502
544
#if self.checker.poll() is None:
503
545
# os.kill(self.checker.pid, signal.SIGKILL)
504
except OSError, error:
546
except OSError as error:
505
547
if error.errno != errno.ESRCH: # No such process
507
549
self.checker = None
509
def dbus_service_property(dbus_interface, signature=u"v",
510
access=u"readwrite", byte_arrays=False):
551
def dbus_service_property(dbus_interface, signature="v",
552
access="readwrite", byte_arrays=False):
511
553
"""Decorators for marking methods of a DBusObjectWithProperties to
512
554
become properties on the D-Bus.
591
633
# No such property
592
raise DBusPropertyNotFound(self.dbus_object_path + u":"
593
+ interface_name + u"."
634
raise DBusPropertyNotFound(self.dbus_object_path + ":"
635
+ interface_name + "."
596
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ss",
638
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
598
640
def Get(self, interface_name, property_name):
599
641
"""Standard D-Bus property Get() method, see D-Bus standard.
601
643
prop = self._get_dbus_property(interface_name, property_name)
602
if prop._dbus_access == u"write":
644
if prop._dbus_access == "write":
603
645
raise DBusPropertyAccessException(property_name)
605
if not hasattr(value, u"variant_level"):
647
if not hasattr(value, "variant_level"):
607
649
return type(value)(value, variant_level=value.variant_level+1)
609
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ssv")
651
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
610
652
def Set(self, interface_name, property_name, value):
611
653
"""Standard D-Bus property Set() method, see D-Bus standard.
613
655
prop = self._get_dbus_property(interface_name, property_name)
614
if prop._dbus_access == u"read":
656
if prop._dbus_access == "read":
615
657
raise DBusPropertyAccessException(property_name)
616
if prop._dbus_get_args_options[u"byte_arrays"]:
658
if prop._dbus_get_args_options["byte_arrays"]:
617
659
# The byte_arrays option is not supported yet on
618
660
# signatures other than "ay".
619
if prop._dbus_signature != u"ay":
661
if prop._dbus_signature != "ay":
621
663
value = dbus.ByteArray(''.join(unichr(byte)
622
664
for byte in value))
625
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"s",
626
out_signature=u"a{sv}")
667
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
668
out_signature="a{sv}")
627
669
def GetAll(self, interface_name):
628
670
"""Standard D-Bus property GetAll() method, see D-Bus
660
702
document = xml.dom.minidom.parseString(xmlstring)
661
703
def make_tag(document, name, prop):
662
e = document.createElement(u"property")
663
e.setAttribute(u"name", name)
664
e.setAttribute(u"type", prop._dbus_signature)
665
e.setAttribute(u"access", prop._dbus_access)
704
e = document.createElement("property")
705
e.setAttribute("name", name)
706
e.setAttribute("type", prop._dbus_signature)
707
e.setAttribute("access", prop._dbus_access)
667
for if_tag in document.getElementsByTagName(u"interface"):
709
for if_tag in document.getElementsByTagName("interface"):
668
710
for tag in (make_tag(document, name, prop)
670
712
in self._get_all_dbus_properties()
671
713
if prop._dbus_interface
672
== if_tag.getAttribute(u"name")):
714
== if_tag.getAttribute("name")):
673
715
if_tag.appendChild(tag)
674
716
# Add the names to the return values for the
675
717
# "org.freedesktop.DBus.Properties" methods
676
if (if_tag.getAttribute(u"name")
677
== u"org.freedesktop.DBus.Properties"):
678
for cn in if_tag.getElementsByTagName(u"method"):
679
if cn.getAttribute(u"name") == u"Get":
680
for arg in cn.getElementsByTagName(u"arg"):
681
if (arg.getAttribute(u"direction")
683
arg.setAttribute(u"name", u"value")
684
elif cn.getAttribute(u"name") == u"GetAll":
685
for arg in cn.getElementsByTagName(u"arg"):
686
if (arg.getAttribute(u"direction")
688
arg.setAttribute(u"name", u"props")
689
xmlstring = document.toxml(u"utf-8")
718
if (if_tag.getAttribute("name")
719
== "org.freedesktop.DBus.Properties"):
720
for cn in if_tag.getElementsByTagName("method"):
721
if cn.getAttribute("name") == "Get":
722
for arg in cn.getElementsByTagName("arg"):
723
if (arg.getAttribute("direction")
725
arg.setAttribute("name", "value")
726
elif cn.getAttribute("name") == "GetAll":
727
for arg in cn.getElementsByTagName("arg"):
728
if (arg.getAttribute("direction")
730
arg.setAttribute("name", "props")
731
xmlstring = document.toxml("utf-8")
690
732
document.unlink()
691
733
except (AttributeError, xml.dom.DOMException,
692
xml.parsers.expat.ExpatError), error:
693
logger.error(u"Failed to override Introspection method",
734
xml.parsers.expat.ExpatError) as error:
735
logger.error("Failed to override Introspection method",
702
744
dbus_object_path: dbus.ObjectPath
703
745
bus: dbus.SystemBus()
748
runtime_expansions = (Client.runtime_expansions
749
+ ("dbus_object_path",))
705
751
# dbus.service.Object doesn't use super(), so we can't either.
707
753
def __init__(self, bus = None, *args, **kwargs):
754
self._approvals_pending = 0
709
756
Client.__init__(self, *args, **kwargs)
710
757
# Only now, when this client is initialized, can it show up on
759
client_object_name = unicode(self.name).translate(
712
762
self.dbus_object_path = (dbus.ObjectPath
714
+ self.name.replace(u".", u"_")))
763
("/clients/" + client_object_name))
715
764
DBusObjectWithProperties.__init__(self, self.bus,
716
765
self.dbus_object_path)
767
def _get_approvals_pending(self):
768
return self._approvals_pending
769
def _set_approvals_pending(self, value):
770
old_value = self._approvals_pending
771
self._approvals_pending = value
773
if (hasattr(self, "dbus_object_path")
774
and bval is not bool(old_value)):
775
dbus_bool = dbus.Boolean(bval, variant_level=1)
776
self.PropertyChanged(dbus.String("ApprovalPending"),
779
approvals_pending = property(_get_approvals_pending,
780
_set_approvals_pending)
781
del _get_approvals_pending, _set_approvals_pending
719
784
def _datetime_to_dbus(dt, variant_level=0):
722
787
variant_level=variant_level)
724
789
def enable(self):
725
oldstate = getattr(self, u"enabled", False)
790
oldstate = getattr(self, "enabled", False)
726
791
r = Client.enable(self)
727
792
if oldstate != self.enabled:
728
793
# Emit D-Bus signals
729
self.PropertyChanged(dbus.String(u"enabled"),
794
self.PropertyChanged(dbus.String("Enabled"),
730
795
dbus.Boolean(True, variant_level=1))
731
796
self.PropertyChanged(
732
dbus.String(u"last_enabled"),
797
dbus.String("LastEnabled"),
733
798
self._datetime_to_dbus(self.last_enabled,
734
799
variant_level=1))
737
802
def disable(self, quiet = False):
738
oldstate = getattr(self, u"enabled", False)
803
oldstate = getattr(self, "enabled", False)
739
804
r = Client.disable(self, quiet=quiet)
740
805
if not quiet and oldstate != self.enabled:
741
806
# Emit D-Bus signal
742
self.PropertyChanged(dbus.String(u"enabled"),
807
self.PropertyChanged(dbus.String("Enabled"),
743
808
dbus.Boolean(False, variant_level=1))
796
869
# Emit D-Bus signal
797
870
self.CheckerStarted(self.current_checker_command)
798
871
self.PropertyChanged(
799
dbus.String(u"checker_running"),
872
dbus.String("CheckerRunning"),
800
873
dbus.Boolean(True, variant_level=1))
803
876
def stop_checker(self, *args, **kwargs):
804
old_checker = getattr(self, u"checker", None)
877
old_checker = getattr(self, "checker", None)
805
878
r = Client.stop_checker(self, *args, **kwargs)
806
879
if (old_checker is not None
807
and getattr(self, u"checker", None) is None):
808
self.PropertyChanged(dbus.String(u"checker_running"),
880
and getattr(self, "checker", None) is None):
881
self.PropertyChanged(dbus.String("CheckerRunning"),
809
882
dbus.Boolean(False, variant_level=1))
816
889
def approve(self, value=True):
890
self.send_changedstate()
817
891
self._approved = value
818
gobject.timeout_add(self._timedelta_to_milliseconds(self.approved_duration, self._reset_approved))
892
gobject.timeout_add(self._timedelta_to_milliseconds
893
(self.approval_duration),
894
self._reset_approved)
820
897
## D-Bus methods, signals & properties
821
_interface = u"se.bsnet.fukt.Mandos.Client"
898
_interface = "se.bsnet.fukt.Mandos.Client"
825
902
# CheckerCompleted - signal
826
@dbus.service.signal(_interface, signature=u"nxs")
903
@dbus.service.signal(_interface, signature="nxs")
827
904
def CheckerCompleted(self, exitcode, waitstatus, command):
831
908
# CheckerStarted - signal
832
@dbus.service.signal(_interface, signature=u"s")
909
@dbus.service.signal(_interface, signature="s")
833
910
def CheckerStarted(self, command):
837
914
# PropertyChanged - signal
838
@dbus.service.signal(_interface, signature=u"sv")
915
@dbus.service.signal(_interface, signature="sv")
839
916
def PropertyChanged(self, property, value):
898
# xxx 3 new properties
901
@dbus_service_property(_interface, signature=u"s", access=u"read")
902
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
self.PropertyChanged(dbus.String("ApprovedByDefault"),
992
dbus.Boolean(value, variant_level=1))
994
# ApprovalDelay - property
995
@dbus_service_property(_interface, signature="t",
997
def ApprovalDelay_dbus_property(self, value=None):
998
if value is None: # get
999
return dbus.UInt64(self.approval_delay_milliseconds())
1000
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1002
self.PropertyChanged(dbus.String("ApprovalDelay"),
1003
dbus.UInt64(value, variant_level=1))
1005
# ApprovalDuration - property
1006
@dbus_service_property(_interface, signature="t",
1008
def ApprovalDuration_dbus_property(self, value=None):
1009
if value is None: # get
1010
return dbus.UInt64(self._timedelta_to_milliseconds(
1011
self.approval_duration))
1012
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1014
self.PropertyChanged(dbus.String("ApprovalDuration"),
1015
dbus.UInt64(value, variant_level=1))
1018
@dbus_service_property(_interface, signature="s", access="read")
1019
def Name_dbus_property(self):
903
1020
return dbus.String(self.name)
905
# fingerprint - property
906
@dbus_service_property(_interface, signature=u"s", access=u"read")
907
def fingerprint_dbus_property(self):
1022
# Fingerprint - property
1023
@dbus_service_property(_interface, signature="s", access="read")
1024
def Fingerprint_dbus_property(self):
908
1025
return dbus.String(self.fingerprint)
911
@dbus_service_property(_interface, signature=u"s",
913
def host_dbus_property(self, value=None):
1028
@dbus_service_property(_interface, signature="s",
1030
def Host_dbus_property(self, value=None):
914
1031
if value is None: # get
915
1032
return dbus.String(self.host)
916
1033
self.host = value
917
1034
# Emit D-Bus signal
918
self.PropertyChanged(dbus.String(u"host"),
1035
self.PropertyChanged(dbus.String("Host"),
919
1036
dbus.String(value, variant_level=1))
922
@dbus_service_property(_interface, signature=u"s", access=u"read")
923
def created_dbus_property(self):
1038
# Created - property
1039
@dbus_service_property(_interface, signature="s", access="read")
1040
def Created_dbus_property(self):
924
1041
return dbus.String(self._datetime_to_dbus(self.created))
926
# last_enabled - property
927
@dbus_service_property(_interface, signature=u"s", access=u"read")
928
def last_enabled_dbus_property(self):
1043
# LastEnabled - property
1044
@dbus_service_property(_interface, signature="s", access="read")
1045
def LastEnabled_dbus_property(self):
929
1046
if self.last_enabled is None:
930
return dbus.String(u"")
1047
return dbus.String("")
931
1048
return dbus.String(self._datetime_to_dbus(self.last_enabled))
934
@dbus_service_property(_interface, signature=u"b",
936
def enabled_dbus_property(self, value=None):
1050
# Enabled - property
1051
@dbus_service_property(_interface, signature="b",
1053
def Enabled_dbus_property(self, value=None):
937
1054
if value is None: # get
938
1055
return dbus.Boolean(self.enabled)
944
# last_checked_ok - property
945
@dbus_service_property(_interface, signature=u"s",
947
def last_checked_ok_dbus_property(self, value=None):
1061
# LastCheckedOK - property
1062
@dbus_service_property(_interface, signature="s",
1064
def LastCheckedOK_dbus_property(self, value=None):
948
1065
if value is not None:
949
1066
self.checked_ok()
951
1068
if self.last_checked_ok is None:
952
return dbus.String(u"")
1069
return dbus.String("")
953
1070
return dbus.String(self._datetime_to_dbus(self
954
1071
.last_checked_ok))
957
@dbus_service_property(_interface, signature=u"t",
959
def timeout_dbus_property(self, value=None):
1073
# LastApprovalRequest - property
1074
@dbus_service_property(_interface, signature="s", access="read")
1075
def LastApprovalRequest_dbus_property(self):
1076
if self.last_approval_request is None:
1077
return dbus.String("")
1078
return dbus.String(self.
1079
_datetime_to_dbus(self
1080
.last_approval_request))
1082
# Timeout - property
1083
@dbus_service_property(_interface, signature="t",
1085
def Timeout_dbus_property(self, value=None):
960
1086
if value is None: # get
961
1087
return dbus.UInt64(self.timeout_milliseconds())
962
1088
self.timeout = datetime.timedelta(0, 0, 0, value)
963
1089
# Emit D-Bus signal
964
self.PropertyChanged(dbus.String(u"timeout"),
1090
self.PropertyChanged(dbus.String("Timeout"),
965
1091
dbus.UInt64(value, variant_level=1))
966
if getattr(self, u"disable_initiator_tag", None) is None:
1092
if getattr(self, "disable_initiator_tag", None) is None:
968
1094
# Reschedule timeout
969
1095
gobject.source_remove(self.disable_initiator_tag)
981
1107
self.disable_initiator_tag = (gobject.timeout_add
982
1108
(time_to_die, self.disable))
984
# interval - property
985
@dbus_service_property(_interface, signature=u"t",
987
def interval_dbus_property(self, value=None):
1110
# Interval - property
1111
@dbus_service_property(_interface, signature="t",
1113
def Interval_dbus_property(self, value=None):
988
1114
if value is None: # get
989
1115
return dbus.UInt64(self.interval_milliseconds())
990
1116
self.interval = datetime.timedelta(0, 0, 0, value)
991
1117
# Emit D-Bus signal
992
self.PropertyChanged(dbus.String(u"interval"),
1118
self.PropertyChanged(dbus.String("Interval"),
993
1119
dbus.UInt64(value, variant_level=1))
994
if getattr(self, u"checker_initiator_tag", None) is None:
1120
if getattr(self, "checker_initiator_tag", None) is None:
996
1122
# Reschedule checker run
997
1123
gobject.source_remove(self.checker_initiator_tag)
999
1125
(value, self.start_checker))
1000
1126
self.start_checker() # Start one now, too
1002
# checker - property
1003
@dbus_service_property(_interface, signature=u"s",
1004
access=u"readwrite")
1005
def checker_dbus_property(self, value=None):
1128
# Checker - property
1129
@dbus_service_property(_interface, signature="s",
1131
def Checker_dbus_property(self, value=None):
1006
1132
if value is None: # get
1007
1133
return dbus.String(self.checker_command)
1008
1134
self.checker_command = value
1009
1135
# Emit D-Bus signal
1010
self.PropertyChanged(dbus.String(u"checker"),
1136
self.PropertyChanged(dbus.String("Checker"),
1011
1137
dbus.String(self.checker_command,
1012
1138
variant_level=1))
1014
# checker_running - property
1015
@dbus_service_property(_interface, signature=u"b",
1016
access=u"readwrite")
1017
def checker_running_dbus_property(self, value=None):
1140
# CheckerRunning - property
1141
@dbus_service_property(_interface, signature="b",
1143
def CheckerRunning_dbus_property(self, value=None):
1018
1144
if value is None: # get
1019
1145
return dbus.Boolean(self.checker is not None)
1100
1226
# Start communication using the Mandos protocol
1101
1227
# Get protocol number
1102
1228
line = self.request.makefile().readline()
1103
logger.debug(u"Protocol version: %r", line)
1229
logger.debug("Protocol version: %r", line)
1105
1231
if int(line.strip().split()[0]) > 1:
1106
1232
raise RuntimeError
1107
except (ValueError, IndexError, RuntimeError), error:
1108
logger.error(u"Unknown protocol version: %s", error)
1233
except (ValueError, IndexError, RuntimeError) as error:
1234
logger.error("Unknown protocol version: %s", error)
1111
1237
# Start GnuTLS connection
1113
1239
session.handshake()
1114
except gnutls.errors.GNUTLSError, error:
1115
logger.warning(u"Handshake failed: %s", error)
1240
except gnutls.errors.GNUTLSError as error:
1241
logger.warning("Handshake failed: %s", error)
1116
1242
# Do not run session.bye() here: the session is not
1117
1243
# established. Just abandon the request.
1119
logger.debug(u"Handshake succeeded")
1245
logger.debug("Handshake succeeded")
1247
approval_required = False
1122
1250
fpr = self.fingerprint(self.peer_certificate
1124
except (TypeError, gnutls.errors.GNUTLSError), error:
1125
logger.warning(u"Bad certificate: %s", error)
1253
gnutls.errors.GNUTLSError) as error:
1254
logger.warning("Bad certificate: %s", error)
1127
logger.debug(u"Fingerprint: %s", fpr)
1256
logger.debug("Fingerprint: %s", fpr)
1130
1259
client = ProxyClient(child_pipe, fpr,
1132
1261
except KeyError:
1135
delay = client.approved_delay
1264
if client.approval_delay:
1265
delay = client.approval_delay
1266
client.approvals_pending += 1
1267
approval_required = True
1137
1270
if not client.enabled:
1138
logger.warning(u"Client %s is disabled",
1271
logger.info("Client %s is disabled",
1140
1273
if self.server.use_dbus:
1141
1274
# Emit D-Bus signal
1142
1275
client.Rejected("Disabled")
1144
if client._approved is None:
1145
logger.info(u"Client %s need approval",
1278
if client._approved or not client.approval_delay:
1279
#We are approved or approval is disabled
1281
elif client._approved is None:
1282
logger.info("Client %s needs approval",
1147
1284
if self.server.use_dbus:
1148
1285
# Emit D-Bus signal
1149
1286
client.NeedApproval(
1150
client.approved_delay_milliseconds(),
1287
client.approval_delay_milliseconds(),
1151
1288
client.approved_by_default)
1152
elif client._approved:
1153
#We have a password and are approved
1156
logger.warning(u"Client %s was not approved",
1290
logger.warning("Client %s was not approved",
1158
1292
if self.server.use_dbus:
1160
client.Rejected("Disapproved")
1294
client.Rejected("Denied")
1163
1297
#wait until timeout or approved
1316
1460
bind to an address or port if they were not specified."""
1317
1461
if self.interface is not None:
1318
1462
if SO_BINDTODEVICE is None:
1319
logger.error(u"SO_BINDTODEVICE does not exist;"
1320
u" cannot bind to interface %s",
1463
logger.error("SO_BINDTODEVICE does not exist;"
1464
" cannot bind to interface %s",
1321
1465
self.interface)
1324
1468
self.socket.setsockopt(socket.SOL_SOCKET,
1325
1469
SO_BINDTODEVICE,
1326
1470
str(self.interface
1328
except socket.error, error:
1472
except socket.error as error:
1329
1473
if error[0] == errno.EPERM:
1330
logger.error(u"No permission to"
1331
u" bind to interface %s",
1474
logger.error("No permission to"
1475
" bind to interface %s",
1332
1476
self.interface)
1333
1477
elif error[0] == errno.ENOPROTOOPT:
1334
logger.error(u"SO_BINDTODEVICE not available;"
1335
u" cannot bind to interface %s",
1478
logger.error("SO_BINDTODEVICE not available;"
1479
" cannot bind to interface %s",
1336
1480
self.interface)
1453
1598
parent_pipe.send(('function',))
1455
1600
parent_pipe.send(('data', client_object.__getattribute__(attrname)))
1457
1602
if command == 'setattr':
1458
1603
attrname = request[1]
1459
1604
value = request[2]
1460
1605
setattr(client_object, attrname, value)
1465
1610
def string_to_delta(interval):
1466
1611
"""Parse a string and return a datetime.timedelta
1468
>>> string_to_delta(u'7d')
1613
>>> string_to_delta('7d')
1469
1614
datetime.timedelta(7)
1470
>>> string_to_delta(u'60s')
1615
>>> string_to_delta('60s')
1471
1616
datetime.timedelta(0, 60)
1472
>>> string_to_delta(u'60m')
1617
>>> string_to_delta('60m')
1473
1618
datetime.timedelta(0, 3600)
1474
>>> string_to_delta(u'24h')
1619
>>> string_to_delta('24h')
1475
1620
datetime.timedelta(1)
1476
>>> string_to_delta(u'1w')
1621
>>> string_to_delta('1w')
1477
1622
datetime.timedelta(7)
1478
>>> string_to_delta(u'5m 30s')
1623
>>> string_to_delta('5m 30s')
1479
1624
datetime.timedelta(0, 330)
1481
1626
timevalue = datetime.timedelta(0)
1555
1700
##################################################################
1556
1701
# Parsing of options, both command line and config file
1558
parser = optparse.OptionParser(version = "%%prog %s" % version)
1559
parser.add_option("-i", u"--interface", type=u"string",
1560
metavar="IF", help=u"Bind to interface IF")
1561
parser.add_option("-a", u"--address", type=u"string",
1562
help=u"Address to listen for requests on")
1563
parser.add_option("-p", u"--port", type=u"int",
1564
help=u"Port number to receive requests on")
1565
parser.add_option("--check", action=u"store_true",
1566
help=u"Run self-test")
1567
parser.add_option("--debug", action=u"store_true",
1568
help=u"Debug mode; run in foreground and log to"
1570
parser.add_option("--priority", type=u"string", help=u"GnuTLS"
1571
u" priority string (see GnuTLS documentation)")
1572
parser.add_option("--servicename", type=u"string",
1573
metavar=u"NAME", help=u"Zeroconf service name")
1574
parser.add_option("--configdir", type=u"string",
1575
default=u"/etc/mandos", metavar=u"DIR",
1576
help=u"Directory to search for configuration"
1578
parser.add_option("--no-dbus", action=u"store_false",
1579
dest=u"use_dbus", help=u"Do not provide D-Bus"
1580
u" system bus interface")
1581
parser.add_option("--no-ipv6", action=u"store_false",
1582
dest=u"use_ipv6", help=u"Do not use IPv6")
1583
options = parser.parse_args()[0]
1703
parser = argparse.ArgumentParser()
1704
parser.add_argument("-v", "--version", action="version",
1705
version = "%%(prog)s %s" % version,
1706
help="show version number and exit")
1707
parser.add_argument("-i", "--interface", metavar="IF",
1708
help="Bind to interface IF")
1709
parser.add_argument("-a", "--address",
1710
help="Address to listen for requests on")
1711
parser.add_argument("-p", "--port", type=int,
1712
help="Port number to receive requests on")
1713
parser.add_argument("--check", action="store_true",
1714
help="Run self-test")
1715
parser.add_argument("--debug", action="store_true",
1716
help="Debug mode; run in foreground and log"
1718
parser.add_argument("--debuglevel", metavar="LEVEL",
1719
help="Debug level for stdout output")
1720
parser.add_argument("--priority", help="GnuTLS"
1721
" priority string (see GnuTLS documentation)")
1722
parser.add_argument("--servicename",
1723
metavar="NAME", help="Zeroconf service name")
1724
parser.add_argument("--configdir",
1725
default="/etc/mandos", metavar="DIR",
1726
help="Directory to search for configuration"
1728
parser.add_argument("--no-dbus", action="store_false",
1729
dest="use_dbus", help="Do not provide D-Bus"
1730
" system bus interface")
1731
parser.add_argument("--no-ipv6", action="store_false",
1732
dest="use_ipv6", help="Do not use IPv6")
1733
options = parser.parse_args()
1585
1735
if options.check:
1590
1740
# Default values for config file for server-global settings
1591
server_defaults = { u"interface": u"",
1596
u"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1597
u"servicename": u"Mandos",
1598
u"use_dbus": u"True",
1599
u"use_ipv6": u"True",
1741
server_defaults = { "interface": "",
1746
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1747
"servicename": "Mandos",
1602
1753
# Parse config file for server-global settings
1603
1754
server_config = configparser.SafeConfigParser(server_defaults)
1604
1755
del server_defaults
1605
1756
server_config.read(os.path.join(options.configdir,
1607
1758
# Convert the SafeConfigParser object to a dict
1608
1759
server_settings = server_config.defaults()
1609
1760
# Use the appropriate methods on the non-string config options
1610
for option in (u"debug", u"use_dbus", u"use_ipv6"):
1611
server_settings[option] = server_config.getboolean(u"DEFAULT",
1761
for option in ("debug", "use_dbus", "use_ipv6"):
1762
server_settings[option] = server_config.getboolean("DEFAULT",
1613
1764
if server_settings["port"]:
1614
server_settings["port"] = server_config.getint(u"DEFAULT",
1765
server_settings["port"] = server_config.getint("DEFAULT",
1616
1767
del server_config
1618
1769
# Override the settings from the config file with command line
1619
1770
# options, if set.
1620
for option in (u"interface", u"address", u"port", u"debug",
1621
u"priority", u"servicename", u"configdir",
1622
u"use_dbus", u"use_ipv6"):
1771
for option in ("interface", "address", "port", "debug",
1772
"priority", "servicename", "configdir",
1773
"use_dbus", "use_ipv6", "debuglevel"):
1623
1774
value = getattr(options, option)
1624
1775
if value is not None:
1625
1776
server_settings[option] = value
1633
1784
##################################################################
1635
1786
# For convenience
1636
debug = server_settings[u"debug"]
1637
use_dbus = server_settings[u"use_dbus"]
1638
use_ipv6 = server_settings[u"use_ipv6"]
1641
syslogger.setLevel(logging.WARNING)
1642
console.setLevel(logging.WARNING)
1644
if server_settings[u"servicename"] != u"Mandos":
1787
debug = server_settings["debug"]
1788
debuglevel = server_settings["debuglevel"]
1789
use_dbus = server_settings["use_dbus"]
1790
use_ipv6 = server_settings["use_ipv6"]
1792
if server_settings["servicename"] != "Mandos":
1645
1793
syslogger.setFormatter(logging.Formatter
1646
(u'Mandos (%s) [%%(process)d]:'
1647
u' %%(levelname)s: %%(message)s'
1648
% server_settings[u"servicename"]))
1794
('Mandos (%s) [%%(process)d]:'
1795
' %%(levelname)s: %%(message)s'
1796
% server_settings["servicename"]))
1650
1798
# Parse config file with clients
1651
client_defaults = { u"timeout": u"1h",
1653
u"checker": u"fping -q -- %%(host)s",
1655
u"approved_delay": u"5m",
1656
u"approved_duration": u"1s",
1799
client_defaults = { "timeout": "1h",
1801
"checker": "fping -q -- %%(host)s",
1803
"approval_delay": "0s",
1804
"approval_duration": "1s",
1658
1806
client_config = configparser.SafeConfigParser(client_defaults)
1659
client_config.read(os.path.join(server_settings[u"configdir"],
1807
client_config.read(os.path.join(server_settings["configdir"],
1662
1810
global mandos_dbus_service
1663
1811
mandos_dbus_service = None
1665
tcp_server = MandosServer((server_settings[u"address"],
1666
server_settings[u"port"]),
1813
tcp_server = MandosServer((server_settings["address"],
1814
server_settings["port"]),
1668
interface=server_settings[u"interface"],
1816
interface=(server_settings["interface"]
1669
1818
use_ipv6=use_ipv6,
1670
1819
gnutls_priority=
1671
server_settings[u"priority"],
1820
server_settings["priority"],
1672
1821
use_dbus=use_dbus)
1673
pidfilename = u"/var/run/mandos.pid"
1675
pidfile = open(pidfilename, u"w")
1677
logger.error(u"Could not open file %r", pidfilename)
1823
pidfilename = "/var/run/mandos.pid"
1825
pidfile = open(pidfilename, "w")
1827
logger.error("Could not open file %r", pidfilename)
1680
uid = pwd.getpwnam(u"_mandos").pw_uid
1681
gid = pwd.getpwnam(u"_mandos").pw_gid
1830
uid = pwd.getpwnam("_mandos").pw_uid
1831
gid = pwd.getpwnam("_mandos").pw_gid
1682
1832
except KeyError:
1684
uid = pwd.getpwnam(u"mandos").pw_uid
1685
gid = pwd.getpwnam(u"mandos").pw_gid
1834
uid = pwd.getpwnam("mandos").pw_uid
1835
gid = pwd.getpwnam("mandos").pw_gid
1686
1836
except KeyError:
1688
uid = pwd.getpwnam(u"nobody").pw_uid
1689
gid = pwd.getpwnam(u"nobody").pw_gid
1838
uid = pwd.getpwnam("nobody").pw_uid
1839
gid = pwd.getpwnam("nobody").pw_gid
1690
1840
except KeyError:
1696
except OSError, error:
1846
except OSError as error:
1697
1847
if error[0] != errno.EPERM:
1700
# Enable all possible GnuTLS debugging
1850
if not debug and not debuglevel:
1851
syslogger.setLevel(logging.WARNING)
1852
console.setLevel(logging.WARNING)
1854
level = getattr(logging, debuglevel.upper())
1855
syslogger.setLevel(level)
1856
console.setLevel(level)
1859
# Enable all possible GnuTLS debugging
1702
1861
# "Use a log level over 10 to enable all debugging options."
1703
1862
# - GnuTLS manual
1704
1863
gnutls.library.functions.gnutls_global_set_log_level(11)
1706
1865
@gnutls.library.types.gnutls_log_func
1707
1866
def debug_gnutls(level, string):
1708
logger.debug(u"GnuTLS: %s", string[:-1])
1867
logger.debug("GnuTLS: %s", string[:-1])
1710
1869
(gnutls.library.functions
1711
1870
.gnutls_global_set_log_function(debug_gnutls))
1872
# Redirect stdin so all checkers get /dev/null
1873
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1874
os.dup2(null, sys.stdin.fileno())
1878
# No console logging
1879
logger.removeHandler(console)
1881
# Need to fork before connecting to D-Bus
1883
# Close all input and output, do double fork, etc.
1713
1886
global main_loop
1714
1887
# From the Avahi example code
1718
1891
# End of Avahi example code
1721
bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos",
1894
bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
1722
1895
bus, do_not_queue=True)
1723
except dbus.exceptions.NameExistsException, e:
1724
logger.error(unicode(e) + u", disabling D-Bus")
1896
except dbus.exceptions.NameExistsException as e:
1897
logger.error(unicode(e) + ", disabling D-Bus")
1725
1898
use_dbus = False
1726
server_settings[u"use_dbus"] = False
1899
server_settings["use_dbus"] = False
1727
1900
tcp_server.use_dbus = False
1728
1901
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1729
service = AvahiService(name = server_settings[u"servicename"],
1730
servicetype = u"_mandos._tcp",
1902
service = AvahiService(name = server_settings["servicename"],
1903
servicetype = "_mandos._tcp",
1731
1904
protocol = protocol, bus = bus)
1732
1905
if server_settings["interface"]:
1733
1906
service.interface = (if_nametoindex
1734
(str(server_settings[u"interface"])))
1907
(str(server_settings["interface"])))
1909
global multiprocessing_manager
1910
multiprocessing_manager = multiprocessing.Manager()
1736
1912
client_class = Client
1738
1914
client_class = functools.partial(ClientDBus, bus = bus)
1739
1915
def client_config_items(config, section):
1740
1916
special_settings = {
1741
"approve_by_default":
1917
"approved_by_default":
1742
1918
lambda: config.getboolean(section,
1743
"approve_by_default"),
1919
"approved_by_default"),
1745
1921
for name, value in config.items(section):
1747
yield special_settings[name]()
1923
yield (name, special_settings[name]())
1748
1924
except KeyError:
1749
1925
yield (name, value)
1754
1930
client_config, section)))
1755
1931
for section in client_config.sections()))
1756
1932
if not tcp_server.clients:
1757
logger.warning(u"No clients defined")
1760
# Redirect stdin so all checkers get /dev/null
1761
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1762
os.dup2(null, sys.stdin.fileno())
1766
# No console logging
1767
logger.removeHandler(console)
1768
# Close all input and output, do double fork, etc.
1774
pidfile.write(str(pid) + "\n")
1777
logger.error(u"Could not write to file %r with PID %d",
1780
# "pidfile" was never created
1933
logger.warning("No clients defined")
1939
pidfile.write(str(pid) + "\n".encode("utf-8"))
1942
logger.error("Could not write to file %r with PID %d",
1945
# "pidfile" was never created
1785
1949
signal.signal(signal.SIGINT, signal.SIG_IGN)
1786
1951
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1787
1952
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
1790
1955
class MandosDBusService(dbus.service.Object):
1791
1956
"""A D-Bus proxy object"""
1792
1957
def __init__(self):
1793
dbus.service.Object.__init__(self, bus, u"/")
1794
_interface = u"se.bsnet.fukt.Mandos"
1958
dbus.service.Object.__init__(self, bus, "/")
1959
_interface = "se.bsnet.fukt.Mandos"
1796
@dbus.service.signal(_interface, signature=u"o")
1961
@dbus.service.signal(_interface, signature="o")
1797
1962
def ClientAdded(self, objpath):
1801
@dbus.service.signal(_interface, signature=u"ss")
1966
@dbus.service.signal(_interface, signature="ss")
1802
1967
def ClientNotFound(self, fingerprint, address):
1806
@dbus.service.signal(_interface, signature=u"os")
1971
@dbus.service.signal(_interface, signature="os")
1807
1972
def ClientRemoved(self, objpath, name):
1811
@dbus.service.method(_interface, out_signature=u"ao")
1976
@dbus.service.method(_interface, out_signature="ao")
1812
1977
def GetAllClients(self):
1814
1979
return dbus.Array(c.dbus_object_path
1815
1980
for c in tcp_server.clients)
1817
1982
@dbus.service.method(_interface,
1818
out_signature=u"a{oa{sv}}")
1983
out_signature="a{oa{sv}}")
1819
1984
def GetAllClientsWithProperties(self):
1821
1986
return dbus.Dictionary(
1822
((c.dbus_object_path, c.GetAll(u""))
1987
((c.dbus_object_path, c.GetAll(""))
1823
1988
for c in tcp_server.clients),
1824
signature=u"oa{sv}")
1826
@dbus.service.method(_interface, in_signature=u"o")
1991
@dbus.service.method(_interface, in_signature="o")
1827
1992
def RemoveClient(self, object_path):
1829
1994
for c in tcp_server.clients: