151
147
self.group = None # our entry group
152
148
self.server = None
154
self.entry_group_state_changed_match = None
155
150
def rename(self):
156
151
"""Derived from the Avahi example code"""
157
152
if self.rename_count >= self.max_renames:
158
logger.critical("No suitable Zeroconf service name found"
159
" after %i retries, exiting.",
153
logger.critical(u"No suitable Zeroconf service name found"
154
u" after %i retries, exiting.",
160
155
self.rename_count)
161
raise AvahiServiceError("Too many renames")
162
self.name = unicode(self.server.GetAlternativeServiceName(self.name))
163
logger.info("Changing Zeroconf service name to %r ...",
156
raise AvahiServiceError(u"Too many renames")
157
self.name = self.server.GetAlternativeServiceName(self.name)
158
logger.info(u"Changing Zeroconf service name to %r ...",
165
160
syslogger.setFormatter(logging.Formatter
166
('Mandos (%s) [%%(process)d]:'
167
' %%(levelname)s: %%(message)s'
161
(u'Mandos (%s) [%%(process)d]:'
162
u' %%(levelname)s: %%(message)s'
172
except dbus.exceptions.DBusException as error:
173
logger.critical("DBusException: %s", error)
176
166
self.rename_count += 1
177
167
def remove(self):
178
168
"""Derived from the Avahi example code"""
179
169
if self.group is not None:
182
except (dbus.exceptions.UnknownMethodException,
183
dbus.exceptions.DBusException) as e:
186
if self.entry_group_state_changed_match is not None:
187
self.entry_group_state_changed_match.remove()
188
self.entry_group_state_changed_match = None
190
172
"""Derived from the Avahi example code"""
192
self.group = dbus.Interface(
193
self.bus.get_object(avahi.DBUS_NAME,
194
self.server.EntryGroupNew(),
195
follow_name_owner_changes=True),
196
avahi.DBUS_INTERFACE_ENTRY_GROUP)
197
self.entry_group_state_changed_match = (
198
self.group.connect_to_signal(
199
'StateChanged', self .entry_group_state_changed))
200
logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
173
if self.group is None:
174
self.group = dbus.Interface(
175
self.bus.get_object(avahi.DBUS_NAME,
176
self.server.EntryGroupNew()),
177
avahi.DBUS_INTERFACE_ENTRY_GROUP)
178
self.group.connect_to_signal('StateChanged',
180
.entry_group_state_changed)
181
logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
201
182
self.name, self.type)
202
183
self.group.AddService(
210
191
self.group.Commit()
211
192
def entry_group_state_changed(self, state, error):
212
193
"""Derived from the Avahi example code"""
213
logger.debug("Avahi entry group state change: %i", state)
194
logger.debug(u"Avahi state change: %i", state)
215
196
if state == avahi.ENTRY_GROUP_ESTABLISHED:
216
logger.debug("Zeroconf service established.")
197
logger.debug(u"Zeroconf service established.")
217
198
elif state == avahi.ENTRY_GROUP_COLLISION:
218
logger.info("Zeroconf service name collision.")
199
logger.warning(u"Zeroconf service name collision.")
220
201
elif state == avahi.ENTRY_GROUP_FAILURE:
221
logger.critical("Avahi: Error in group state changed %s",
202
logger.critical(u"Avahi: Error in group state changed %s",
223
raise AvahiGroupError("State changed: %s"
204
raise AvahiGroupError(u"State changed: %s"
224
205
% unicode(error))
225
206
def cleanup(self):
226
207
"""Derived from the Avahi example code"""
228
def server_state_changed(self, state, error=None):
208
if self.group is not None:
211
def server_state_changed(self, state):
229
212
"""Derived from the Avahi example code"""
230
logger.debug("Avahi server state change: %i", state)
231
bad_states = { avahi.SERVER_INVALID:
232
"Zeroconf server invalid",
233
avahi.SERVER_REGISTERING: None,
234
avahi.SERVER_COLLISION:
235
"Zeroconf server name collision",
236
avahi.SERVER_FAILURE:
237
"Zeroconf server failure" }
238
if state in bad_states:
239
if bad_states[state]:
240
logger.error(bad_states[state])
213
if state == avahi.SERVER_COLLISION:
214
logger.error(u"Zeroconf server name collision")
242
216
elif state == avahi.SERVER_RUNNING:
245
logger.debug("Unknown state: %r", state)
246
218
def activate(self):
247
219
"""Derived from the Avahi example code"""
248
220
if self.server is None:
249
221
self.server = dbus.Interface(
250
222
self.bus.get_object(avahi.DBUS_NAME,
251
avahi.DBUS_PATH_SERVER,
252
follow_name_owner_changes=True),
223
avahi.DBUS_PATH_SERVER),
253
224
avahi.DBUS_INTERFACE_SERVER)
254
self.server.connect_to_signal("StateChanged",
225
self.server.connect_to_signal(u"StateChanged",
255
226
self.server_state_changed)
256
227
self.server_state_changed(self.server.GetState())
260
231
"""A representation of a client host served by this server.
263
_approved: bool(); 'None' if not yet approved/disapproved
264
approval_delay: datetime.timedelta(); Time to wait for approval
265
approval_duration: datetime.timedelta(); Duration of one approval
234
name: string; from the config file, used in log messages and
236
fingerprint: string (40 or 32 hexadecimal digits); used to
237
uniquely identify the client
238
secret: bytestring; sent verbatim (over TLS) to client
239
host: string; available for use by the checker command
240
created: datetime.datetime(); (UTC) object creation
241
last_enabled: datetime.datetime(); (UTC)
243
last_checked_ok: datetime.datetime(); (UTC) or None
244
timeout: datetime.timedelta(); How long from last_checked_ok
245
until this client is invalid
246
interval: datetime.timedelta(); How often to start a new checker
247
disable_hook: If set, called by disable() as disable_hook(self)
266
248
checker: subprocess.Popen(); a running checker process used
267
249
to see if the client lives.
268
250
'None' if no process is running.
269
checker_callback_tag: a gobject event source tag, or None
270
checker_command: string; External command which is run to check
271
if client lives. %() expansions are done at
251
checker_initiator_tag: a gobject event source tag, or None
252
disable_initiator_tag: - '' -
253
checker_callback_tag: - '' -
254
checker_command: string; External command which is run to check if
255
client lives. %() expansions are done at
272
256
runtime with vars(self) as dict, so that for
273
257
instance %(name)s can be used in the command.
274
checker_initiator_tag: a gobject event source tag, or None
275
created: datetime.datetime(); (UTC) object creation
276
258
current_checker_command: string; current running checker_command
277
disable_hook: If set, called by disable() as disable_hook(self)
278
disable_initiator_tag: a gobject event source tag, or None
280
fingerprint: string (40 or 32 hexadecimal digits); used to
281
uniquely identify the client
282
host: string; available for use by the checker command
283
interval: datetime.timedelta(); How often to start a new checker
284
last_approval_request: datetime.datetime(); (UTC) or None
285
last_checked_ok: datetime.datetime(); (UTC) or None
286
last_enabled: datetime.datetime(); (UTC)
287
name: string; from the config file, used in log messages and
289
secret: bytestring; sent verbatim (over TLS) to client
290
timeout: datetime.timedelta(); How long from last_checked_ok
291
until this client is disabled
292
runtime_expansions: Allowed attributes for runtime expansion.
295
runtime_expansions = ("approval_delay", "approval_duration",
296
"created", "enabled", "fingerprint",
297
"host", "interval", "last_checked_ok",
298
"last_enabled", "name", "timeout")
301
262
def _timedelta_to_milliseconds(td):
302
263
"Convert a datetime.timedelta() to milliseconds"
323
281
if config is None:
325
logger.debug("Creating client %r", self.name)
283
logger.debug(u"Creating client %r", self.name)
326
284
# Uppercase and remove spaces from fingerprint for later
327
285
# comparison purposes with return value from the fingerprint()
329
self.fingerprint = (config["fingerprint"].upper()
331
logger.debug(" Fingerprint: %s", self.fingerprint)
332
if "secret" in config:
333
self.secret = config["secret"].decode("base64")
334
elif "secfile" in config:
335
with open(os.path.expanduser(os.path.expandvars
336
(config["secfile"])),
287
self.fingerprint = (config[u"fingerprint"].upper()
289
logger.debug(u" Fingerprint: %s", self.fingerprint)
290
if u"secret" in config:
291
self.secret = config[u"secret"].decode(u"base64")
292
elif u"secfile" in config:
293
with closing(open(os.path.expanduser
295
(config[u"secfile"])),
338
297
self.secret = secfile.read()
340
raise TypeError("No secret or secfile for client %s"
299
raise TypeError(u"No secret or secfile for client %s"
342
self.host = config.get("host", "")
301
self.host = config.get(u"host", u"")
343
302
self.created = datetime.datetime.utcnow()
344
303
self.enabled = False
345
self.last_approval_request = None
346
304
self.last_enabled = None
347
305
self.last_checked_ok = None
348
self.timeout = string_to_delta(config["timeout"])
349
self.interval = string_to_delta(config["interval"])
306
self.timeout = string_to_delta(config[u"timeout"])
307
self.interval = string_to_delta(config[u"interval"])
350
308
self.disable_hook = disable_hook
351
309
self.checker = None
352
310
self.checker_initiator_tag = None
353
311
self.disable_initiator_tag = None
354
312
self.checker_callback_tag = None
355
self.checker_command = config["checker"]
313
self.checker_command = config[u"checker"]
356
314
self.current_checker_command = None
357
315
self.last_connect = None
358
self._approved = None
359
self.approved_by_default = config.get("approved_by_default",
361
self.approvals_pending = 0
362
self.approval_delay = string_to_delta(
363
config["approval_delay"])
364
self.approval_duration = string_to_delta(
365
config["approval_duration"])
366
self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
368
def send_changedstate(self):
369
self.changedstate.acquire()
370
self.changedstate.notify_all()
371
self.changedstate.release()
373
317
def enable(self):
374
318
"""Start this client's checker and timeout hooks"""
375
if getattr(self, "enabled", False):
319
if getattr(self, u"enabled", False):
376
320
# Already enabled
378
self.send_changedstate()
379
322
self.last_enabled = datetime.datetime.utcnow()
380
323
# Schedule a new checker to be started an 'interval' from now,
381
324
# and every interval from then on.
382
325
self.checker_initiator_tag = (gobject.timeout_add
383
326
(self.interval_milliseconds(),
384
327
self.start_checker))
328
# Also start a new checker *right now*.
385
330
# Schedule a disable() when 'timeout' has passed
386
331
self.disable_initiator_tag = (gobject.timeout_add
387
332
(self.timeout_milliseconds(),
389
334
self.enabled = True
390
# Also start a new checker *right now*.
393
def disable(self, quiet=True):
394
337
"""Disable this client."""
395
338
if not getattr(self, "enabled", False):
398
self.send_changedstate()
400
logger.info("Disabling client %s", self.name)
401
if getattr(self, "disable_initiator_tag", False):
340
logger.info(u"Disabling client %s", self.name)
341
if getattr(self, u"disable_initiator_tag", False):
402
342
gobject.source_remove(self.disable_initiator_tag)
403
343
self.disable_initiator_tag = None
404
if getattr(self, "checker_initiator_tag", False):
344
if getattr(self, u"checker_initiator_tag", False):
405
345
gobject.source_remove(self.checker_initiator_tag)
406
346
self.checker_initiator_tag = None
407
347
self.stop_checker()
458
395
# client would inevitably timeout, since no checker would get
459
396
# a chance to run to completion. If we instead leave running
460
397
# checkers alone, the checker would have to take more time
461
# than 'timeout' for the client to be disabled, which is as it
398
# than 'timeout' for the client to be declared invalid, which
399
# is as it should be.
464
401
# If a checker exists, make sure it is not a zombie
466
403
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
467
except (AttributeError, OSError) as error:
404
except (AttributeError, OSError), error:
468
405
if (isinstance(error, OSError)
469
406
and error.errno != errno.ECHILD):
473
logger.warning("Checker was a zombie")
410
logger.warning(u"Checker was a zombie")
474
411
gobject.source_remove(self.checker_callback_tag)
475
412
self.checker_callback(pid, status,
476
413
self.current_checker_command)
481
418
command = self.checker_command % self.host
482
419
except TypeError:
483
420
# Escape attributes for the shell
484
escaped_attrs = dict(
486
re.escape(unicode(str(getattr(self, attr, "")),
490
self.runtime_expansions)
421
escaped_attrs = dict((key,
422
re.escape(unicode(str(val),
426
vars(self).iteritems())
493
428
command = self.checker_command % escaped_attrs
494
except TypeError as error:
495
logger.error('Could not format string "%s":'
496
' %s', self.checker_command, error)
429
except TypeError, error:
430
logger.error(u'Could not format string "%s":'
431
u' %s', self.checker_command, error)
497
432
return True # Try again later
498
433
self.current_checker_command = command
500
logger.info("Starting checker %r for %s",
435
logger.info(u"Starting checker %r for %s",
501
436
command, self.name)
502
437
# We don't need to redirect stdout and stderr, since
503
438
# in normal mode, that is already done by daemon(),
527
462
if self.checker_callback_tag:
528
463
gobject.source_remove(self.checker_callback_tag)
529
464
self.checker_callback_tag = None
530
if getattr(self, "checker", None) is None:
465
if getattr(self, u"checker", None) is None:
532
logger.debug("Stopping checker for %(name)s", vars(self))
467
logger.debug(u"Stopping checker for %(name)s", vars(self))
534
469
os.kill(self.checker.pid, signal.SIGTERM)
536
471
#if self.checker.poll() is None:
537
472
# os.kill(self.checker.pid, signal.SIGKILL)
538
except OSError as error:
473
except OSError, error:
539
474
if error.errno != errno.ESRCH: # No such process
541
476
self.checker = None
543
def dbus_service_property(dbus_interface, signature="v",
544
access="readwrite", byte_arrays=False):
478
def still_valid(self):
479
"""Has the timeout not yet passed for this client?"""
480
if not getattr(self, u"enabled", False):
482
now = datetime.datetime.utcnow()
483
if self.last_checked_ok is None:
484
return now < (self.created + self.timeout)
486
return now < (self.last_checked_ok + self.timeout)
489
def dbus_service_property(dbus_interface, signature=u"v",
490
access=u"readwrite", byte_arrays=False):
545
491
"""Decorators for marking methods of a DBusObjectWithProperties to
546
492
become properties on the D-Bus.
625
566
# No such property
626
raise DBusPropertyNotFound(self.dbus_object_path + ":"
627
+ interface_name + "."
567
raise DBusPropertyNotFound(self.dbus_object_path + u":"
568
+ interface_name + u"."
630
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
571
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ss",
632
573
def Get(self, interface_name, property_name):
633
574
"""Standard D-Bus property Get() method, see D-Bus standard.
635
576
prop = self._get_dbus_property(interface_name, property_name)
636
if prop._dbus_access == "write":
577
if prop._dbus_access == u"write":
637
578
raise DBusPropertyAccessException(property_name)
639
if not hasattr(value, "variant_level"):
580
if not hasattr(value, u"variant_level"):
641
582
return type(value)(value, variant_level=value.variant_level+1)
643
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
584
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ssv")
644
585
def Set(self, interface_name, property_name, value):
645
586
"""Standard D-Bus property Set() method, see D-Bus standard.
647
588
prop = self._get_dbus_property(interface_name, property_name)
648
if prop._dbus_access == "read":
589
if prop._dbus_access == u"read":
649
590
raise DBusPropertyAccessException(property_name)
650
if prop._dbus_get_args_options["byte_arrays"]:
651
# The byte_arrays option is not supported yet on
652
# signatures other than "ay".
653
if prop._dbus_signature != "ay":
591
if prop._dbus_get_args_options[u"byte_arrays"]:
655
592
value = dbus.ByteArray(''.join(unichr(byte)
656
593
for byte in value))
659
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
660
out_signature="a{sv}")
596
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"s",
597
out_signature=u"a{sv}")
661
598
def GetAll(self, interface_name):
662
599
"""Standard D-Bus property GetAll() method, see D-Bus
694
631
document = xml.dom.minidom.parseString(xmlstring)
695
632
def make_tag(document, name, prop):
696
e = document.createElement("property")
697
e.setAttribute("name", name)
698
e.setAttribute("type", prop._dbus_signature)
699
e.setAttribute("access", prop._dbus_access)
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)
701
for if_tag in document.getElementsByTagName("interface"):
638
for if_tag in document.getElementsByTagName(u"interface"):
702
639
for tag in (make_tag(document, name, prop)
704
641
in self._get_all_dbus_properties()
705
642
if prop._dbus_interface
706
== if_tag.getAttribute("name")):
643
== if_tag.getAttribute(u"name")):
707
644
if_tag.appendChild(tag)
708
645
# Add the names to the return values for the
709
646
# "org.freedesktop.DBus.Properties" methods
710
if (if_tag.getAttribute("name")
711
== "org.freedesktop.DBus.Properties"):
712
for cn in if_tag.getElementsByTagName("method"):
713
if cn.getAttribute("name") == "Get":
714
for arg in cn.getElementsByTagName("arg"):
715
if (arg.getAttribute("direction")
717
arg.setAttribute("name", "value")
718
elif cn.getAttribute("name") == "GetAll":
719
for arg in cn.getElementsByTagName("arg"):
720
if (arg.getAttribute("direction")
722
arg.setAttribute("name", "props")
723
xmlstring = document.toxml("utf-8")
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")
724
661
document.unlink()
725
662
except (AttributeError, xml.dom.DOMException,
726
xml.parsers.expat.ExpatError) as error:
727
logger.error("Failed to override Introspection method",
663
xml.parsers.expat.ExpatError), error:
664
logger.error(u"Failed to override Introspection method",
736
673
dbus_object_path: dbus.ObjectPath
737
674
bus: dbus.SystemBus()
740
runtime_expansions = (Client.runtime_expansions
741
+ ("dbus_object_path",))
743
676
# dbus.service.Object doesn't use super(), so we can't either.
745
678
def __init__(self, bus = None, *args, **kwargs):
746
self._approvals_pending = 0
748
680
Client.__init__(self, *args, **kwargs)
749
681
# Only now, when this client is initialized, can it show up on
751
client_object_name = unicode(self.name).translate(
754
683
self.dbus_object_path = (dbus.ObjectPath
755
("/clients/" + client_object_name))
685
+ self.name.replace(u".", u"_")))
756
686
DBusObjectWithProperties.__init__(self, self.bus,
757
687
self.dbus_object_path)
759
def _get_approvals_pending(self):
760
return self._approvals_pending
761
def _set_approvals_pending(self, value):
762
old_value = self._approvals_pending
763
self._approvals_pending = value
765
if (hasattr(self, "dbus_object_path")
766
and bval is not bool(old_value)):
767
dbus_bool = dbus.Boolean(bval, variant_level=1)
768
self.PropertyChanged(dbus.String("ApprovalPending"),
771
approvals_pending = property(_get_approvals_pending,
772
_set_approvals_pending)
773
del _get_approvals_pending, _set_approvals_pending
776
690
def _datetime_to_dbus(dt, variant_level=0):
779
693
variant_level=variant_level)
781
695
def enable(self):
782
oldstate = getattr(self, "enabled", False)
696
oldstate = getattr(self, u"enabled", False)
783
697
r = Client.enable(self)
784
698
if oldstate != self.enabled:
785
699
# Emit D-Bus signals
786
self.PropertyChanged(dbus.String("Enabled"),
700
self.PropertyChanged(dbus.String(u"enabled"),
787
701
dbus.Boolean(True, variant_level=1))
788
702
self.PropertyChanged(
789
dbus.String("LastEnabled"),
703
dbus.String(u"last_enabled"),
790
704
self._datetime_to_dbus(self.last_enabled,
791
705
variant_level=1))
794
def disable(self, quiet = False):
795
oldstate = getattr(self, "enabled", False)
796
r = Client.disable(self, quiet=quiet)
797
if not quiet and oldstate != self.enabled:
708
def disable(self, signal = True):
709
oldstate = getattr(self, u"enabled", False)
710
r = Client.disable(self)
711
if signal and oldstate != self.enabled:
798
712
# Emit D-Bus signal
799
self.PropertyChanged(dbus.String("Enabled"),
713
self.PropertyChanged(dbus.String(u"enabled"),
800
714
dbus.Boolean(False, variant_level=1))
861
767
# Emit D-Bus signal
862
768
self.CheckerStarted(self.current_checker_command)
863
769
self.PropertyChanged(
864
dbus.String("CheckerRunning"),
770
dbus.String(u"checker_running"),
865
771
dbus.Boolean(True, variant_level=1))
868
774
def stop_checker(self, *args, **kwargs):
869
old_checker = getattr(self, "checker", None)
775
old_checker = getattr(self, u"checker", None)
870
776
r = Client.stop_checker(self, *args, **kwargs)
871
777
if (old_checker is not None
872
and getattr(self, "checker", None) is None):
873
self.PropertyChanged(dbus.String("CheckerRunning"),
778
and getattr(self, u"checker", None) is None):
779
self.PropertyChanged(dbus.String(u"checker_running"),
874
780
dbus.Boolean(False, variant_level=1))
877
def _reset_approved(self):
878
self._approved = None
881
def approve(self, value=True):
882
self.send_changedstate()
883
self._approved = value
884
gobject.timeout_add(self._timedelta_to_milliseconds
885
(self.approval_duration),
886
self._reset_approved)
889
## D-Bus methods, signals & properties
890
_interface = "se.bsnet.fukt.Mandos.Client"
783
## D-Bus methods & signals
784
_interface = u"se.bsnet.fukt.Mandos.Client"
787
@dbus.service.method(_interface)
789
return self.checked_ok()
894
791
# CheckerCompleted - signal
895
@dbus.service.signal(_interface, signature="nxs")
792
@dbus.service.signal(_interface, signature=u"nxs")
896
793
def CheckerCompleted(self, exitcode, waitstatus, command):
900
797
# CheckerStarted - signal
901
@dbus.service.signal(_interface, signature="s")
798
@dbus.service.signal(_interface, signature=u"s")
902
799
def CheckerStarted(self, command):
906
803
# PropertyChanged - signal
907
@dbus.service.signal(_interface, signature="sv")
804
@dbus.service.signal(_interface, signature=u"sv")
908
805
def PropertyChanged(self, property, value):
965
841
def StopChecker(self):
966
842
self.stop_checker()
970
# ApprovalPending - property
971
@dbus_service_property(_interface, signature="b", access="read")
972
def ApprovalPending_dbus_property(self):
973
return dbus.Boolean(bool(self.approvals_pending))
975
# ApprovedByDefault - property
976
@dbus_service_property(_interface, signature="b",
978
def ApprovedByDefault_dbus_property(self, value=None):
979
if value is None: # get
980
return dbus.Boolean(self.approved_by_default)
981
self.approved_by_default = bool(value)
983
self.PropertyChanged(dbus.String("ApprovedByDefault"),
984
dbus.Boolean(value, variant_level=1))
986
# ApprovalDelay - property
987
@dbus_service_property(_interface, signature="t",
989
def ApprovalDelay_dbus_property(self, value=None):
990
if value is None: # get
991
return dbus.UInt64(self.approval_delay_milliseconds())
992
self.approval_delay = datetime.timedelta(0, 0, 0, value)
994
self.PropertyChanged(dbus.String("ApprovalDelay"),
995
dbus.UInt64(value, variant_level=1))
997
# ApprovalDuration - property
998
@dbus_service_property(_interface, signature="t",
1000
def ApprovalDuration_dbus_property(self, value=None):
1001
if value is None: # get
1002
return dbus.UInt64(self._timedelta_to_milliseconds(
1003
self.approval_duration))
1004
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1006
self.PropertyChanged(dbus.String("ApprovalDuration"),
1007
dbus.UInt64(value, variant_level=1))
1010
@dbus_service_property(_interface, signature="s", access="read")
1011
def Name_dbus_property(self):
845
@dbus_service_property(_interface, signature=u"s", access=u"read")
846
def name_dbus_property(self):
1012
847
return dbus.String(self.name)
1014
# Fingerprint - property
1015
@dbus_service_property(_interface, signature="s", access="read")
1016
def Fingerprint_dbus_property(self):
849
# fingerprint - property
850
@dbus_service_property(_interface, signature=u"s", access=u"read")
851
def fingerprint_dbus_property(self):
1017
852
return dbus.String(self.fingerprint)
1020
@dbus_service_property(_interface, signature="s",
1022
def Host_dbus_property(self, value=None):
855
@dbus_service_property(_interface, signature=u"s",
857
def host_dbus_property(self, value=None):
1023
858
if value is None: # get
1024
859
return dbus.String(self.host)
1025
860
self.host = value
1026
861
# Emit D-Bus signal
1027
self.PropertyChanged(dbus.String("Host"),
862
self.PropertyChanged(dbus.String(u"host"),
1028
863
dbus.String(value, variant_level=1))
1030
# Created - property
1031
@dbus_service_property(_interface, signature="s", access="read")
1032
def Created_dbus_property(self):
866
@dbus_service_property(_interface, signature=u"s", access=u"read")
867
def created_dbus_property(self):
1033
868
return dbus.String(self._datetime_to_dbus(self.created))
1035
# LastEnabled - property
1036
@dbus_service_property(_interface, signature="s", access="read")
1037
def LastEnabled_dbus_property(self):
870
# last_enabled - property
871
@dbus_service_property(_interface, signature=u"s", access=u"read")
872
def last_enabled_dbus_property(self):
1038
873
if self.last_enabled is None:
1039
return dbus.String("")
874
return dbus.String(u"")
1040
875
return dbus.String(self._datetime_to_dbus(self.last_enabled))
1042
# Enabled - property
1043
@dbus_service_property(_interface, signature="b",
1045
def Enabled_dbus_property(self, value=None):
878
@dbus_service_property(_interface, signature=u"b",
880
def enabled_dbus_property(self, value=None):
1046
881
if value is None: # get
1047
882
return dbus.Boolean(self.enabled)
1053
# LastCheckedOK - property
1054
@dbus_service_property(_interface, signature="s",
1056
def LastCheckedOK_dbus_property(self, value=None):
888
# last_checked_ok - property
889
@dbus_service_property(_interface, signature=u"s",
891
def last_checked_ok_dbus_property(self, value=None):
1057
892
if value is not None:
1058
893
self.checked_ok()
1060
895
if self.last_checked_ok is None:
1061
return dbus.String("")
896
return dbus.String(u"")
1062
897
return dbus.String(self._datetime_to_dbus(self
1063
898
.last_checked_ok))
1065
# LastApprovalRequest - property
1066
@dbus_service_property(_interface, signature="s", access="read")
1067
def LastApprovalRequest_dbus_property(self):
1068
if self.last_approval_request is None:
1069
return dbus.String("")
1070
return dbus.String(self.
1071
_datetime_to_dbus(self
1072
.last_approval_request))
1074
# Timeout - property
1075
@dbus_service_property(_interface, signature="t",
1077
def Timeout_dbus_property(self, value=None):
901
@dbus_service_property(_interface, signature=u"t",
903
def timeout_dbus_property(self, value=None):
1078
904
if value is None: # get
1079
905
return dbus.UInt64(self.timeout_milliseconds())
1080
906
self.timeout = datetime.timedelta(0, 0, 0, value)
1081
907
# Emit D-Bus signal
1082
self.PropertyChanged(dbus.String("Timeout"),
908
self.PropertyChanged(dbus.String(u"timeout"),
1083
909
dbus.UInt64(value, variant_level=1))
1084
if getattr(self, "disable_initiator_tag", None) is None:
910
if getattr(self, u"disable_initiator_tag", None) is None:
1086
912
# Reschedule timeout
1087
913
gobject.source_remove(self.disable_initiator_tag)
1117
943
(value, self.start_checker))
1118
944
self.start_checker() # Start one now, too
1120
# Checker - property
1121
@dbus_service_property(_interface, signature="s",
1123
def Checker_dbus_property(self, value=None):
947
@dbus_service_property(_interface, signature=u"s",
949
def checker_dbus_property(self, value=None):
1124
950
if value is None: # get
1125
951
return dbus.String(self.checker_command)
1126
952
self.checker_command = value
1127
953
# Emit D-Bus signal
1128
self.PropertyChanged(dbus.String("Checker"),
954
self.PropertyChanged(dbus.String(u"checker"),
1129
955
dbus.String(self.checker_command,
1130
956
variant_level=1))
1132
# CheckerRunning - property
1133
@dbus_service_property(_interface, signature="b",
1135
def CheckerRunning_dbus_property(self, value=None):
958
# checker_running - property
959
@dbus_service_property(_interface, signature=u"b",
961
def checker_running_dbus_property(self, value=None):
1136
962
if value is None: # get
1137
963
return dbus.Boolean(self.checker is not None)
1141
967
self.stop_checker()
1143
# ObjectPath - property
1144
@dbus_service_property(_interface, signature="o", access="read")
1145
def ObjectPath_dbus_property(self):
969
# object_path - property
970
@dbus_service_property(_interface, signature=u"o", access=u"read")
971
def object_path_dbus_property(self):
1146
972
return self.dbus_object_path # is already a dbus.ObjectPath
1149
@dbus_service_property(_interface, signature="ay",
1150
access="write", byte_arrays=True)
1151
def Secret_dbus_property(self, value):
975
@dbus_service_property(_interface, signature=u"ay",
976
access=u"write", byte_arrays=True)
977
def secret_dbus_property(self, value):
1152
978
self.secret = str(value)
1157
class ProxyClient(object):
1158
def __init__(self, child_pipe, fpr, address):
1159
self._pipe = child_pipe
1160
self._pipe.send(('init', fpr, address))
1161
if not self._pipe.recv():
1164
def __getattribute__(self, name):
1165
if(name == '_pipe'):
1166
return super(ProxyClient, self).__getattribute__(name)
1167
self._pipe.send(('getattr', name))
1168
data = self._pipe.recv()
1169
if data[0] == 'data':
1171
if data[0] == 'function':
1172
def func(*args, **kwargs):
1173
self._pipe.send(('funcall', name, args, kwargs))
1174
return self._pipe.recv()[1]
1177
def __setattr__(self, name, value):
1178
if(name == '_pipe'):
1179
return super(ProxyClient, self).__setattr__(name, value)
1180
self._pipe.send(('setattr', name, value))
1183
983
class ClientHandler(socketserver.BaseRequestHandler, object):
1184
984
"""A class to handle client connections.
1187
987
Note: This will run in its own forked process."""
1189
989
def handle(self):
1190
with contextlib.closing(self.server.child_pipe) as child_pipe:
1191
logger.info("TCP connection from: %s",
1192
unicode(self.client_address))
1193
logger.debug("Pipe FD: %d",
1194
self.server.child_pipe.fileno())
990
logger.info(u"TCP connection from: %s",
991
unicode(self.client_address))
992
logger.debug(u"IPC Pipe FD: %d", self.server.pipe[1])
993
# Open IPC pipe to parent process
994
with closing(os.fdopen(self.server.pipe[1], u"w", 1)) as ipc:
1196
995
session = (gnutls.connection
1197
996
.ClientSession(self.request,
1198
997
gnutls.connection
1199
998
.X509Credentials()))
1000
line = self.request.makefile().readline()
1001
logger.debug(u"Protocol version: %r", line)
1003
if int(line.strip().split()[0]) > 1:
1005
except (ValueError, IndexError, RuntimeError), error:
1006
logger.error(u"Unknown protocol version: %s", error)
1201
1009
# Note: gnutls.connection.X509Credentials is really a
1202
1010
# generic GnuTLS certificate credentials object so long as
1203
1011
# no X.509 keys are added to it. Therefore, we can use it
1204
1012
# here despite using OpenPGP certificates.
1206
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1207
# "+AES-256-CBC", "+SHA1",
1208
# "+COMP-NULL", "+CTYPE-OPENPGP",
1014
#priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
1015
# u"+AES-256-CBC", u"+SHA1",
1016
# u"+COMP-NULL", u"+CTYPE-OPENPGP",
1210
1018
# Use a fallback default, since this MUST be set.
1211
1019
priority = self.server.gnutls_priority
1212
1020
if priority is None:
1021
priority = u"NORMAL"
1214
1022
(gnutls.library.functions
1215
1023
.gnutls_priority_set_direct(session._c_object,
1216
1024
priority, None))
1218
# Start communication using the Mandos protocol
1219
# Get protocol number
1220
line = self.request.makefile().readline()
1221
logger.debug("Protocol version: %r", line)
1223
if int(line.strip().split()[0]) > 1:
1225
except (ValueError, IndexError, RuntimeError) as error:
1226
logger.error("Unknown protocol version: %s", error)
1229
# Start GnuTLS connection
1231
1027
session.handshake()
1232
except gnutls.errors.GNUTLSError as error:
1233
logger.warning("Handshake failed: %s", error)
1028
except gnutls.errors.GNUTLSError, error:
1029
logger.warning(u"Handshake failed: %s", error)
1234
1030
# Do not run session.bye() here: the session is not
1235
1031
# established. Just abandon the request.
1237
logger.debug("Handshake succeeded")
1239
approval_required = False
1033
logger.debug(u"Handshake succeeded")
1242
fpr = self.fingerprint(self.peer_certificate
1245
gnutls.errors.GNUTLSError) as error:
1246
logger.warning("Bad certificate: %s", error)
1248
logger.debug("Fingerprint: %s", fpr)
1251
client = ProxyClient(child_pipe, fpr,
1252
self.client_address)
1256
if client.approval_delay:
1257
delay = client.approval_delay
1258
client.approvals_pending += 1
1259
approval_required = True
1262
if not client.enabled:
1263
logger.warning("Client %s is disabled",
1265
if self.server.use_dbus:
1267
client.Rejected("Disabled")
1270
if client._approved or not client.approval_delay:
1271
#We are approved or approval is disabled
1273
elif client._approved is None:
1274
logger.info("Client %s needs approval",
1276
if self.server.use_dbus:
1278
client.NeedApproval(
1279
client.approval_delay_milliseconds(),
1280
client.approved_by_default)
1282
logger.warning("Client %s was not approved",
1284
if self.server.use_dbus:
1286
client.Rejected("Denied")
1289
#wait until timeout or approved
1290
#x = float(client._timedelta_to_milliseconds(delay))
1291
time = datetime.datetime.now()
1292
client.changedstate.acquire()
1293
client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
1294
client.changedstate.release()
1295
time2 = datetime.datetime.now()
1296
if (time2 - time) >= delay:
1297
if not client.approved_by_default:
1298
logger.warning("Client %s timed out while"
1299
" waiting for approval",
1301
if self.server.use_dbus:
1303
client.Rejected("Approval timed out")
1308
delay -= time2 - time
1311
while sent_size < len(client.secret):
1313
sent = session.send(client.secret[sent_size:])
1314
except gnutls.errors.GNUTLSError as error:
1315
logger.warning("gnutls send failed")
1317
logger.debug("Sent: %d, remaining: %d",
1318
sent, len(client.secret)
1319
- (sent_size + sent))
1322
logger.info("Sending secret to %s", client.name)
1323
# bump the timeout as if seen
1325
if self.server.use_dbus:
1035
fpr = self.fingerprint(self.peer_certificate(session))
1036
except (TypeError, gnutls.errors.GNUTLSError), error:
1037
logger.warning(u"Bad certificate: %s", error)
1040
logger.debug(u"Fingerprint: %s", fpr)
1330
if approval_required:
1331
client.approvals_pending -= 1
1334
except gnutls.errors.GNUTLSError as error:
1335
logger.warning("GnuTLS bye failed")
1042
for c in self.server.clients:
1043
if c.fingerprint == fpr:
1047
ipc.write(u"NOTFOUND %s %s\n"
1048
% (fpr, unicode(self.client_address)))
1051
# Have to check if client.still_valid(), since it is
1052
# possible that the client timed out while establishing
1053
# the GnuTLS session.
1054
if not client.still_valid():
1055
ipc.write(u"INVALID %s\n" % client.name)
1058
ipc.write(u"SENDING %s\n" % client.name)
1060
while sent_size < len(client.secret):
1061
sent = session.send(client.secret[sent_size:])
1062
logger.debug(u"Sent: %d, remaining: %d",
1063
sent, len(client.secret)
1064
- (sent_size + sent))
1338
1069
def peer_certificate(session):
1394
1125
# Convert the buffer to a Python bytestring
1395
1126
fpr = ctypes.string_at(buf, buf_len.value)
1396
1127
# Convert the bytestring to hexadecimal notation
1397
hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
1128
hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
1401
class MultiprocessingMixIn(object):
1402
"""Like socketserver.ThreadingMixIn, but with multiprocessing"""
1403
def sub_process_main(self, request, address):
1405
self.finish_request(request, address)
1407
self.handle_error(request, address)
1408
self.close_request(request)
1410
def process_request(self, request, address):
1411
"""Start a new process to process the request."""
1412
multiprocessing.Process(target = self.sub_process_main,
1413
args = (request, address)).start()
1415
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1416
""" adds a pipe to the MixIn """
1132
class ForkingMixInWithPipe(socketserver.ForkingMixIn, object):
1133
"""Like socketserver.ForkingMixIn, but also pass a pipe."""
1417
1134
def process_request(self, request, client_address):
1418
1135
"""Overrides and wraps the original process_request().
1420
1137
This function creates a new pipe in self.pipe
1422
parent_pipe, self.child_pipe = multiprocessing.Pipe()
1424
super(MultiprocessingMixInWithPipe,
1139
self.pipe = os.pipe()
1140
super(ForkingMixInWithPipe,
1425
1141
self).process_request(request, client_address)
1426
self.child_pipe.close()
1427
self.add_pipe(parent_pipe)
1429
def add_pipe(self, parent_pipe):
1142
os.close(self.pipe[1]) # close write end
1143
self.add_pipe(self.pipe[0])
1144
def add_pipe(self, pipe):
1430
1145
"""Dummy function; override as necessary"""
1431
raise NotImplementedError
1433
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1149
class IPv6_TCPServer(ForkingMixInWithPipe,
1434
1150
socketserver.TCPServer, object):
1435
1151
"""IPv6-capable TCP server. Accepts 'None' as address and/or port
1521
1237
return socketserver.TCPServer.server_activate(self)
1522
1238
def enable(self):
1523
1239
self.enabled = True
1524
def add_pipe(self, parent_pipe):
1240
def add_pipe(self, pipe):
1525
1241
# Call "handle_ipc" for both data and EOF events
1526
gobject.io_add_watch(parent_pipe.fileno(),
1527
gobject.IO_IN | gobject.IO_HUP,
1528
functools.partial(self.handle_ipc,
1529
parent_pipe = parent_pipe))
1531
def handle_ipc(self, source, condition, parent_pipe=None,
1532
client_object=None):
1242
gobject.io_add_watch(pipe, gobject.IO_IN | gobject.IO_HUP,
1244
def handle_ipc(self, source, condition, file_objects={}):
1533
1245
condition_names = {
1534
gobject.IO_IN: "IN", # There is data to read.
1535
gobject.IO_OUT: "OUT", # Data can be written (without
1246
gobject.IO_IN: u"IN", # There is data to read.
1247
gobject.IO_OUT: u"OUT", # Data can be written (without
1537
gobject.IO_PRI: "PRI", # There is urgent data to read.
1538
gobject.IO_ERR: "ERR", # Error condition.
1539
gobject.IO_HUP: "HUP" # Hung up (the connection has been
1249
gobject.IO_PRI: u"PRI", # There is urgent data to read.
1250
gobject.IO_ERR: u"ERR", # Error condition.
1251
gobject.IO_HUP: u"HUP" # Hung up (the connection has been
1540
1252
# broken, usually for pipes and
1544
1256
for cond, name in
1545
1257
condition_names.iteritems()
1546
1258
if cond & condition)
1547
# error or the other end of multiprocessing.Pipe has closed
1548
if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
1551
# Read a request from the child
1552
request = parent_pipe.recv()
1553
command = request[0]
1555
if command == 'init':
1557
address = request[2]
1559
for c in self.clients:
1560
if c.fingerprint == fpr:
1564
logger.warning("Client not found for fingerprint: %s, ad"
1565
"dress: %s", fpr, address)
1568
mandos_dbus_service.ClientNotFound(fpr, address[0])
1569
parent_pipe.send(False)
1572
gobject.io_add_watch(parent_pipe.fileno(),
1573
gobject.IO_IN | gobject.IO_HUP,
1574
functools.partial(self.handle_ipc,
1575
parent_pipe = parent_pipe,
1576
client_object = client))
1577
parent_pipe.send(True)
1578
# remove the old hook in favor of the new above hook on same fileno
1580
if command == 'funcall':
1581
funcname = request[1]
1585
parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
1587
if command == 'getattr':
1588
attrname = request[1]
1589
if callable(client_object.__getattribute__(attrname)):
1590
parent_pipe.send(('function',))
1592
parent_pipe.send(('data', client_object.__getattribute__(attrname)))
1594
if command == 'setattr':
1595
attrname = request[1]
1597
setattr(client_object, attrname, value)
1259
logger.debug(u"Handling IPC: FD = %d, condition = %s", source,
1262
# Turn the pipe file descriptor into a Python file object
1263
if source not in file_objects:
1264
file_objects[source] = os.fdopen(source, u"r", 1)
1266
# Read a line from the file object
1267
cmdline = file_objects[source].readline()
1268
if not cmdline: # Empty line means end of file
1269
# close the IPC pipe
1270
file_objects[source].close()
1271
del file_objects[source]
1273
# Stop calling this function
1276
logger.debug(u"IPC command: %r", cmdline)
1278
# Parse and act on command
1279
cmd, args = cmdline.rstrip(u"\r\n").split(None, 1)
1281
if cmd == u"NOTFOUND":
1282
logger.warning(u"Client not found for fingerprint: %s",
1286
mandos_dbus_service.ClientNotFound(args)
1287
elif cmd == u"INVALID":
1288
for client in self.clients:
1289
if client.name == args:
1290
logger.warning(u"Client %s is invalid", args)
1296
logger.error(u"Unknown client %s is invalid", args)
1297
elif cmd == u"SENDING":
1298
for client in self.clients:
1299
if client.name == args:
1300
logger.info(u"Sending secret to %s", client.name)
1307
logger.error(u"Sending secret to unknown client %s",
1310
logger.error(u"Unknown IPC command: %r", cmdline)
1312
# Keep calling this function
1602
1316
def string_to_delta(interval):
1603
1317
"""Parse a string and return a datetime.timedelta
1605
>>> string_to_delta('7d')
1319
>>> string_to_delta(u'7d')
1606
1320
datetime.timedelta(7)
1607
>>> string_to_delta('60s')
1321
>>> string_to_delta(u'60s')
1608
1322
datetime.timedelta(0, 60)
1609
>>> string_to_delta('60m')
1323
>>> string_to_delta(u'60m')
1610
1324
datetime.timedelta(0, 3600)
1611
>>> string_to_delta('24h')
1325
>>> string_to_delta(u'24h')
1612
1326
datetime.timedelta(1)
1613
>>> string_to_delta('1w')
1327
>>> string_to_delta(u'1w')
1614
1328
datetime.timedelta(7)
1615
>>> string_to_delta('5m 30s')
1329
>>> string_to_delta(u'5m 30s')
1616
1330
datetime.timedelta(0, 330)
1618
1332
timevalue = datetime.timedelta(0)
1692
1406
##################################################################
1693
1407
# Parsing of options, both command line and config file
1695
parser = argparse.ArgumentParser()
1696
parser.add_argument("-v", "--version", action="version",
1697
version = "%%(prog)s %s" % version,
1698
help="show version number and exit")
1699
parser.add_argument("-i", "--interface", metavar="IF",
1700
help="Bind to interface IF")
1701
parser.add_argument("-a", "--address",
1702
help="Address to listen for requests on")
1703
parser.add_argument("-p", "--port", type=int,
1704
help="Port number to receive requests on")
1705
parser.add_argument("--check", action="store_true",
1706
help="Run self-test")
1707
parser.add_argument("--debug", action="store_true",
1708
help="Debug mode; run in foreground and log"
1710
parser.add_argument("--debuglevel", metavar="LEVEL",
1711
help="Debug level for stdout output")
1712
parser.add_argument("--priority", help="GnuTLS"
1713
" priority string (see GnuTLS documentation)")
1714
parser.add_argument("--servicename",
1715
metavar="NAME", help="Zeroconf service name")
1716
parser.add_argument("--configdir",
1717
default="/etc/mandos", metavar="DIR",
1718
help="Directory to search for configuration"
1720
parser.add_argument("--no-dbus", action="store_false",
1721
dest="use_dbus", help="Do not provide D-Bus"
1722
" system bus interface")
1723
parser.add_argument("--no-ipv6", action="store_false",
1724
dest="use_ipv6", help="Do not use IPv6")
1725
options = parser.parse_args()
1409
parser = optparse.OptionParser(version = "%%prog %s" % version)
1410
parser.add_option("-i", u"--interface", type=u"string",
1411
metavar="IF", help=u"Bind to interface IF")
1412
parser.add_option("-a", u"--address", type=u"string",
1413
help=u"Address to listen for requests on")
1414
parser.add_option("-p", u"--port", type=u"int",
1415
help=u"Port number to receive requests on")
1416
parser.add_option("--check", action=u"store_true",
1417
help=u"Run self-test")
1418
parser.add_option("--debug", action=u"store_true",
1419
help=u"Debug mode; run in foreground and log to"
1421
parser.add_option("--priority", type=u"string", help=u"GnuTLS"
1422
u" priority string (see GnuTLS documentation)")
1423
parser.add_option("--servicename", type=u"string",
1424
metavar=u"NAME", help=u"Zeroconf service name")
1425
parser.add_option("--configdir", type=u"string",
1426
default=u"/etc/mandos", metavar=u"DIR",
1427
help=u"Directory to search for configuration"
1429
parser.add_option("--no-dbus", action=u"store_false",
1430
dest=u"use_dbus", help=u"Do not provide D-Bus"
1431
u" system bus interface")
1432
parser.add_option("--no-ipv6", action=u"store_false",
1433
dest=u"use_ipv6", help=u"Do not use IPv6")
1434
options = parser.parse_args()[0]
1727
1436
if options.check:
1732
1441
# Default values for config file for server-global settings
1733
server_defaults = { "interface": "",
1738
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1739
"servicename": "Mandos",
1442
server_defaults = { u"interface": u"",
1447
u"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1448
u"servicename": u"Mandos",
1449
u"use_dbus": u"True",
1450
u"use_ipv6": u"True",
1745
1453
# Parse config file for server-global settings
1746
1454
server_config = configparser.SafeConfigParser(server_defaults)
1747
1455
del server_defaults
1748
1456
server_config.read(os.path.join(options.configdir,
1750
1458
# Convert the SafeConfigParser object to a dict
1751
1459
server_settings = server_config.defaults()
1752
1460
# Use the appropriate methods on the non-string config options
1753
for option in ("debug", "use_dbus", "use_ipv6"):
1754
server_settings[option] = server_config.getboolean("DEFAULT",
1461
for option in (u"debug", u"use_dbus", u"use_ipv6"):
1462
server_settings[option] = server_config.getboolean(u"DEFAULT",
1756
1464
if server_settings["port"]:
1757
server_settings["port"] = server_config.getint("DEFAULT",
1465
server_settings["port"] = server_config.getint(u"DEFAULT",
1759
1467
del server_config
1761
1469
# Override the settings from the config file with command line
1762
1470
# options, if set.
1763
for option in ("interface", "address", "port", "debug",
1764
"priority", "servicename", "configdir",
1765
"use_dbus", "use_ipv6", "debuglevel"):
1471
for option in (u"interface", u"address", u"port", u"debug",
1472
u"priority", u"servicename", u"configdir",
1473
u"use_dbus", u"use_ipv6"):
1766
1474
value = getattr(options, option)
1767
1475
if value is not None:
1768
1476
server_settings[option] = value
1776
1484
##################################################################
1778
1486
# For convenience
1779
debug = server_settings["debug"]
1780
debuglevel = server_settings["debuglevel"]
1781
use_dbus = server_settings["use_dbus"]
1782
use_ipv6 = server_settings["use_ipv6"]
1784
if server_settings["servicename"] != "Mandos":
1487
debug = server_settings[u"debug"]
1488
use_dbus = server_settings[u"use_dbus"]
1489
use_ipv6 = server_settings[u"use_ipv6"]
1492
syslogger.setLevel(logging.WARNING)
1493
console.setLevel(logging.WARNING)
1495
if server_settings[u"servicename"] != u"Mandos":
1785
1496
syslogger.setFormatter(logging.Formatter
1786
('Mandos (%s) [%%(process)d]:'
1787
' %%(levelname)s: %%(message)s'
1788
% server_settings["servicename"]))
1497
(u'Mandos (%s) [%%(process)d]:'
1498
u' %%(levelname)s: %%(message)s'
1499
% server_settings[u"servicename"]))
1790
1501
# Parse config file with clients
1791
client_defaults = { "timeout": "1h",
1793
"checker": "fping -q -- %%(host)s",
1795
"approval_delay": "0s",
1796
"approval_duration": "1s",
1502
client_defaults = { u"timeout": u"1h",
1504
u"checker": u"fping -q -- %%(host)s",
1798
1507
client_config = configparser.SafeConfigParser(client_defaults)
1799
client_config.read(os.path.join(server_settings["configdir"],
1508
client_config.read(os.path.join(server_settings[u"configdir"],
1802
1511
global mandos_dbus_service
1803
1512
mandos_dbus_service = None
1805
tcp_server = MandosServer((server_settings["address"],
1806
server_settings["port"]),
1514
tcp_server = MandosServer((server_settings[u"address"],
1515
server_settings[u"port"]),
1808
interface=(server_settings["interface"]
1517
interface=server_settings[u"interface"],
1810
1518
use_ipv6=use_ipv6,
1811
1519
gnutls_priority=
1812
server_settings["priority"],
1520
server_settings[u"priority"],
1813
1521
use_dbus=use_dbus)
1815
pidfilename = "/var/run/mandos.pid"
1817
pidfile = open(pidfilename, "w")
1819
logger.error("Could not open file %r", pidfilename)
1522
pidfilename = u"/var/run/mandos.pid"
1524
pidfile = open(pidfilename, u"w")
1526
logger.error(u"Could not open file %r", pidfilename)
1822
uid = pwd.getpwnam("_mandos").pw_uid
1823
gid = pwd.getpwnam("_mandos").pw_gid
1529
uid = pwd.getpwnam(u"_mandos").pw_uid
1530
gid = pwd.getpwnam(u"_mandos").pw_gid
1824
1531
except KeyError:
1826
uid = pwd.getpwnam("mandos").pw_uid
1827
gid = pwd.getpwnam("mandos").pw_gid
1533
uid = pwd.getpwnam(u"mandos").pw_uid
1534
gid = pwd.getpwnam(u"mandos").pw_gid
1828
1535
except KeyError:
1830
uid = pwd.getpwnam("nobody").pw_uid
1831
gid = pwd.getpwnam("nobody").pw_gid
1537
uid = pwd.getpwnam(u"nobody").pw_uid
1538
gid = pwd.getpwnam(u"nobody").pw_gid
1832
1539
except KeyError:
1838
except OSError as error:
1545
except OSError, error:
1839
1546
if error[0] != errno.EPERM:
1842
if not debug and not debuglevel:
1843
syslogger.setLevel(logging.WARNING)
1844
console.setLevel(logging.WARNING)
1846
level = getattr(logging, debuglevel.upper())
1847
syslogger.setLevel(level)
1848
console.setLevel(level)
1549
# Enable all possible GnuTLS debugging
1851
# Enable all possible GnuTLS debugging
1853
1551
# "Use a log level over 10 to enable all debugging options."
1854
1552
# - GnuTLS manual
1855
1553
gnutls.library.functions.gnutls_global_set_log_level(11)
1857
1555
@gnutls.library.types.gnutls_log_func
1858
1556
def debug_gnutls(level, string):
1859
logger.debug("GnuTLS: %s", string[:-1])
1557
logger.debug(u"GnuTLS: %s", string[:-1])
1861
1559
(gnutls.library.functions
1862
1560
.gnutls_global_set_log_function(debug_gnutls))
1864
# Redirect stdin so all checkers get /dev/null
1865
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1866
os.dup2(null, sys.stdin.fileno())
1870
# No console logging
1871
logger.removeHandler(console)
1873
# Need to fork before connecting to D-Bus
1875
# Close all input and output, do double fork, etc.
1878
1562
global main_loop
1879
1563
# From the Avahi example code
1882
1566
bus = dbus.SystemBus()
1883
1567
# End of Avahi example code
1886
bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
1887
bus, do_not_queue=True)
1888
except dbus.exceptions.NameExistsException as e:
1889
logger.error(unicode(e) + ", disabling D-Bus")
1891
server_settings["use_dbus"] = False
1892
tcp_server.use_dbus = False
1569
bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos", bus)
1893
1570
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1894
service = AvahiService(name = server_settings["servicename"],
1895
servicetype = "_mandos._tcp",
1571
service = AvahiService(name = server_settings[u"servicename"],
1572
servicetype = u"_mandos._tcp",
1896
1573
protocol = protocol, bus = bus)
1897
1574
if server_settings["interface"]:
1898
1575
service.interface = (if_nametoindex
1899
(str(server_settings["interface"])))
1901
global multiprocessing_manager
1902
multiprocessing_manager = multiprocessing.Manager()
1576
(str(server_settings[u"interface"])))
1904
1578
client_class = Client
1906
1580
client_class = functools.partial(ClientDBus, bus = bus)
1907
def client_config_items(config, section):
1908
special_settings = {
1909
"approved_by_default":
1910
lambda: config.getboolean(section,
1911
"approved_by_default"),
1913
for name, value in config.items(section):
1915
yield (name, special_settings[name]())
1919
1581
tcp_server.clients.update(set(
1920
1582
client_class(name = section,
1921
config= dict(client_config_items(
1922
client_config, section)))
1583
config= dict(client_config.items(section)))
1923
1584
for section in client_config.sections()))
1924
1585
if not tcp_server.clients:
1925
logger.warning("No clients defined")
1586
logger.warning(u"No clients defined")
1589
# Redirect stdin so all checkers get /dev/null
1590
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1591
os.dup2(null, sys.stdin.fileno())
1595
# No console logging
1596
logger.removeHandler(console)
1597
# Close all input and output, do double fork, etc.
1601
with closing(pidfile):
1603
pidfile.write(str(pid) + "\n")
1606
logger.error(u"Could not write to file %r with PID %d",
1609
# "pidfile" was never created
1614
"Cleanup function; run on exit"
1617
while tcp_server.clients:
1618
client = tcp_server.clients.pop()
1619
client.disable_hook = None
1622
atexit.register(cleanup)
1931
pidfile.write(str(pid) + "\n".encode("utf-8"))
1934
logger.error("Could not write to file %r with PID %d",
1937
# "pidfile" was never created
1941
1625
signal.signal(signal.SIGINT, signal.SIG_IGN)
1943
1626
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1944
1627
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
1947
1630
class MandosDBusService(dbus.service.Object):
1948
1631
"""A D-Bus proxy object"""
1949
1632
def __init__(self):
1950
dbus.service.Object.__init__(self, bus, "/")
1951
_interface = "se.bsnet.fukt.Mandos"
1953
@dbus.service.signal(_interface, signature="o")
1954
def ClientAdded(self, objpath):
1958
@dbus.service.signal(_interface, signature="ss")
1959
def ClientNotFound(self, fingerprint, address):
1963
@dbus.service.signal(_interface, signature="os")
1633
dbus.service.Object.__init__(self, bus, u"/")
1634
_interface = u"se.bsnet.fukt.Mandos"
1636
@dbus.service.signal(_interface, signature=u"oa{sv}")
1637
def ClientAdded(self, objpath, properties):
1641
@dbus.service.signal(_interface, signature=u"s")
1642
def ClientNotFound(self, fingerprint):
1646
@dbus.service.signal(_interface, signature=u"os")
1964
1647
def ClientRemoved(self, objpath, name):
1968
@dbus.service.method(_interface, out_signature="ao")
1651
@dbus.service.method(_interface, out_signature=u"ao")
1969
1652
def GetAllClients(self):
1971
1654
return dbus.Array(c.dbus_object_path
1972
1655
for c in tcp_server.clients)
1974
1657
@dbus.service.method(_interface,
1975
out_signature="a{oa{sv}}")
1658
out_signature=u"a{oa{sv}}")
1976
1659
def GetAllClientsWithProperties(self):
1978
1661
return dbus.Dictionary(
1979
((c.dbus_object_path, c.GetAll(""))
1662
((c.dbus_object_path, c.GetAll(u""))
1980
1663
for c in tcp_server.clients),
1664
signature=u"oa{sv}")
1983
@dbus.service.method(_interface, in_signature="o")
1666
@dbus.service.method(_interface, in_signature=u"o")
1984
1667
def RemoveClient(self, object_path):
1986
1669
for c in tcp_server.clients: