152
147
self.group = None # our entry group
153
148
self.server = None
155
self.entry_group_state_changed_match = None
156
150
def rename(self):
157
151
"""Derived from the Avahi example code"""
158
152
if self.rename_count >= self.max_renames:
159
logger.critical("No suitable Zeroconf service name found"
160
" after %i retries, exiting.",
153
logger.critical(u"No suitable Zeroconf service name found"
154
u" after %i retries, exiting.",
161
155
self.rename_count)
162
raise AvahiServiceError("Too many renames")
163
self.name = unicode(self.server.GetAlternativeServiceName(self.name))
164
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 ...",
166
160
syslogger.setFormatter(logging.Formatter
167
('Mandos (%s) [%%(process)d]:'
168
' %%(levelname)s: %%(message)s'
161
(u'Mandos (%s) [%%(process)d]:'
162
u' %%(levelname)s: %%(message)s'
173
except dbus.exceptions.DBusException as error:
174
logger.critical("DBusException: %s", error)
177
166
self.rename_count += 1
178
167
def remove(self):
179
168
"""Derived from the Avahi example code"""
180
if self.entry_group_state_changed_match is not None:
181
self.entry_group_state_changed_match.remove()
182
self.entry_group_state_changed_match = None
183
169
if self.group is not None:
184
170
self.group.Reset()
186
172
"""Derived from the Avahi example code"""
188
173
if self.group is None:
189
174
self.group = dbus.Interface(
190
175
self.bus.get_object(avahi.DBUS_NAME,
191
176
self.server.EntryGroupNew()),
192
177
avahi.DBUS_INTERFACE_ENTRY_GROUP)
193
self.entry_group_state_changed_match = (
194
self.group.connect_to_signal(
195
'StateChanged', self .entry_group_state_changed))
196
logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
178
self.group.connect_to_signal('StateChanged',
180
.entry_group_state_changed)
181
logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
197
182
self.name, self.type)
198
183
self.group.AddService(
206
191
self.group.Commit()
207
192
def entry_group_state_changed(self, state, error):
208
193
"""Derived from the Avahi example code"""
209
logger.debug("Avahi entry group state change: %i", state)
194
logger.debug(u"Avahi state change: %i", state)
211
196
if state == avahi.ENTRY_GROUP_ESTABLISHED:
212
logger.debug("Zeroconf service established.")
197
logger.debug(u"Zeroconf service established.")
213
198
elif state == avahi.ENTRY_GROUP_COLLISION:
214
logger.info("Zeroconf service name collision.")
199
logger.warning(u"Zeroconf service name collision.")
216
201
elif state == avahi.ENTRY_GROUP_FAILURE:
217
logger.critical("Avahi: Error in group state changed %s",
202
logger.critical(u"Avahi: Error in group state changed %s",
219
raise AvahiGroupError("State changed: %s"
204
raise AvahiGroupError(u"State changed: %s"
220
205
% unicode(error))
221
206
def cleanup(self):
222
207
"""Derived from the Avahi example code"""
223
208
if self.group is not None:
226
except (dbus.exceptions.UnknownMethodException,
227
dbus.exceptions.DBusException) as e:
229
210
self.group = None
231
def server_state_changed(self, state, error=None):
211
def server_state_changed(self, state):
232
212
"""Derived from the Avahi example code"""
233
logger.debug("Avahi server state change: %i", state)
234
bad_states = { avahi.SERVER_INVALID:
235
"Zeroconf server invalid",
236
avahi.SERVER_REGISTERING: None,
237
avahi.SERVER_COLLISION:
238
"Zeroconf server name collision",
239
avahi.SERVER_FAILURE:
240
"Zeroconf server failure" }
241
if state in bad_states:
242
if bad_states[state] is not None:
244
logger.error(bad_states[state])
246
logger.error(bad_states[state] + ": %r", error)
213
if state == avahi.SERVER_COLLISION:
214
logger.error(u"Zeroconf server name collision")
248
216
elif state == avahi.SERVER_RUNNING:
252
logger.debug("Unknown state: %r", state)
254
logger.debug("Unknown state: %r: %r", state, error)
255
218
def activate(self):
256
219
"""Derived from the Avahi example code"""
257
220
if self.server is None:
258
221
self.server = dbus.Interface(
259
222
self.bus.get_object(avahi.DBUS_NAME,
260
avahi.DBUS_PATH_SERVER,
261
follow_name_owner_changes=True),
223
avahi.DBUS_PATH_SERVER),
262
224
avahi.DBUS_INTERFACE_SERVER)
263
self.server.connect_to_signal("StateChanged",
225
self.server.connect_to_signal(u"StateChanged",
264
226
self.server_state_changed)
265
227
self.server_state_changed(self.server.GetState())
268
def _timedelta_to_milliseconds(td):
269
"Convert a datetime.timedelta() to milliseconds"
270
return ((td.days * 24 * 60 * 60 * 1000)
271
+ (td.seconds * 1000)
272
+ (td.microseconds // 1000))
274
230
class Client(object):
275
231
"""A representation of a client host served by this server.
278
_approved: bool(); 'None' if not yet approved/disapproved
279
approval_delay: datetime.timedelta(); Time to wait for approval
280
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)
281
248
checker: subprocess.Popen(); a running checker process used
282
249
to see if the client lives.
283
250
'None' if no process is running.
284
checker_callback_tag: a gobject event source tag, or None
285
checker_command: string; External command which is run to check
286
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
287
256
runtime with vars(self) as dict, so that for
288
257
instance %(name)s can be used in the command.
289
checker_initiator_tag: a gobject event source tag, or None
290
created: datetime.datetime(); (UTC) object creation
291
258
current_checker_command: string; current running checker_command
292
disable_hook: If set, called by disable() as disable_hook(self)
293
disable_initiator_tag: a gobject event source tag, or None
295
fingerprint: string (40 or 32 hexadecimal digits); used to
296
uniquely identify the client
297
host: string; available for use by the checker command
298
interval: datetime.timedelta(); How often to start a new checker
299
last_approval_request: datetime.datetime(); (UTC) or None
300
last_checked_ok: datetime.datetime(); (UTC) or None
301
last_enabled: datetime.datetime(); (UTC)
302
name: string; from the config file, used in log messages and
304
secret: bytestring; sent verbatim (over TLS) to client
305
timeout: datetime.timedelta(); How long from last_checked_ok
306
until this client is disabled
307
extended_timeout: extra long timeout when password has been sent
308
runtime_expansions: Allowed attributes for runtime expansion.
309
expires: datetime.datetime(); time (UTC) when a client will be
313
runtime_expansions = ("approval_delay", "approval_duration",
314
"created", "enabled", "fingerprint",
315
"host", "interval", "last_checked_ok",
316
"last_enabled", "name", "timeout")
262
def _timedelta_to_milliseconds(td):
263
"Convert a datetime.timedelta() to milliseconds"
264
return ((td.days * 24 * 60 * 60 * 1000)
265
+ (td.seconds * 1000)
266
+ (td.microseconds // 1000))
318
268
def timeout_milliseconds(self):
319
269
"Return the 'timeout' attribute in milliseconds"
320
return _timedelta_to_milliseconds(self.timeout)
322
def extended_timeout_milliseconds(self):
323
"Return the 'extended_timeout' attribute in milliseconds"
324
return _timedelta_to_milliseconds(self.extended_timeout)
270
return self._timedelta_to_milliseconds(self.timeout)
326
272
def interval_milliseconds(self):
327
273
"Return the 'interval' attribute in milliseconds"
328
return _timedelta_to_milliseconds(self.interval)
330
def approval_delay_milliseconds(self):
331
return _timedelta_to_milliseconds(self.approval_delay)
274
return self._timedelta_to_milliseconds(self.interval)
333
276
def __init__(self, name = None, disable_hook=None, config=None):
334
277
"""Note: the 'checker' key in 'config' sets the
338
281
if config is None:
340
logger.debug("Creating client %r", self.name)
283
logger.debug(u"Creating client %r", self.name)
341
284
# Uppercase and remove spaces from fingerprint for later
342
285
# comparison purposes with return value from the fingerprint()
344
self.fingerprint = (config["fingerprint"].upper()
346
logger.debug(" Fingerprint: %s", self.fingerprint)
347
if "secret" in config:
348
self.secret = config["secret"].decode("base64")
349
elif "secfile" in config:
350
with open(os.path.expanduser(os.path.expandvars
351
(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"])),
353
297
self.secret = secfile.read()
355
raise TypeError("No secret or secfile for client %s"
299
raise TypeError(u"No secret or secfile for client %s"
357
self.host = config.get("host", "")
301
self.host = config.get(u"host", u"")
358
302
self.created = datetime.datetime.utcnow()
359
303
self.enabled = False
360
self.last_approval_request = None
361
304
self.last_enabled = None
362
305
self.last_checked_ok = None
363
self.timeout = string_to_delta(config["timeout"])
364
self.extended_timeout = string_to_delta(config["extended_timeout"])
365
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"])
366
308
self.disable_hook = disable_hook
367
309
self.checker = None
368
310
self.checker_initiator_tag = None
369
311
self.disable_initiator_tag = None
371
312
self.checker_callback_tag = None
372
self.checker_command = config["checker"]
313
self.checker_command = config[u"checker"]
373
314
self.current_checker_command = None
374
315
self.last_connect = None
375
self._approved = None
376
self.approved_by_default = config.get("approved_by_default",
378
self.approvals_pending = 0
379
self.approval_delay = string_to_delta(
380
config["approval_delay"])
381
self.approval_duration = string_to_delta(
382
config["approval_duration"])
383
self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
385
def send_changedstate(self):
386
self.changedstate.acquire()
387
self.changedstate.notify_all()
388
self.changedstate.release()
390
317
def enable(self):
391
318
"""Start this client's checker and timeout hooks"""
392
if getattr(self, "enabled", False):
319
if getattr(self, u"enabled", False):
393
320
# Already enabled
395
self.send_changedstate()
322
self.last_enabled = datetime.datetime.utcnow()
396
323
# Schedule a new checker to be started an 'interval' from now,
397
324
# and every interval from then on.
398
325
self.checker_initiator_tag = (gobject.timeout_add
399
326
(self.interval_milliseconds(),
400
327
self.start_checker))
328
# Also start a new checker *right now*.
401
330
# Schedule a disable() when 'timeout' has passed
402
self.expires = datetime.datetime.utcnow() + self.timeout
403
331
self.disable_initiator_tag = (gobject.timeout_add
404
332
(self.timeout_milliseconds(),
406
334
self.enabled = True
407
self.last_enabled = datetime.datetime.utcnow()
408
# Also start a new checker *right now*.
411
def disable(self, quiet=True):
412
337
"""Disable this client."""
413
338
if not getattr(self, "enabled", False):
416
self.send_changedstate()
418
logger.info("Disabling client %s", self.name)
419
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):
420
342
gobject.source_remove(self.disable_initiator_tag)
421
343
self.disable_initiator_tag = None
423
if getattr(self, "checker_initiator_tag", False):
344
if getattr(self, u"checker_initiator_tag", False):
424
345
gobject.source_remove(self.checker_initiator_tag)
425
346
self.checker_initiator_tag = None
426
347
self.stop_checker()
549
462
if self.checker_callback_tag:
550
463
gobject.source_remove(self.checker_callback_tag)
551
464
self.checker_callback_tag = None
552
if getattr(self, "checker", None) is None:
465
if getattr(self, u"checker", None) is None:
554
logger.debug("Stopping checker for %(name)s", vars(self))
467
logger.debug(u"Stopping checker for %(name)s", vars(self))
556
469
os.kill(self.checker.pid, signal.SIGTERM)
558
471
#if self.checker.poll() is None:
559
472
# os.kill(self.checker.pid, signal.SIGKILL)
560
except OSError as error:
473
except OSError, error:
561
474
if error.errno != errno.ESRCH: # No such process
563
476
self.checker = None
566
def dbus_service_property(dbus_interface, signature="v",
567
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):
568
491
"""Decorators for marking methods of a DBusObjectWithProperties to
569
492
become properties on the D-Bus.
624
542
def _is_dbus_property(obj):
625
return getattr(obj, "_dbus_is_property", False)
543
return getattr(obj, u"_dbus_is_property", False)
627
545
def _get_all_dbus_properties(self):
628
546
"""Returns a generator of (name, attribute) pairs
630
return ((prop.__get__(self)._dbus_name, prop.__get__(self))
631
for cls in self.__class__.__mro__
632
for name, prop in inspect.getmembers(cls, self._is_dbus_property))
548
return ((prop._dbus_name, prop)
550
inspect.getmembers(self, self._is_dbus_property))
634
552
def _get_dbus_property(self, interface_name, property_name):
635
553
"""Returns a bound method if one exists which is a D-Bus
636
554
property with the specified name and interface.
638
for cls in self.__class__.__mro__:
639
for name, value in inspect.getmembers(cls, self._is_dbus_property):
640
if value._dbus_name == property_name and value._dbus_interface == interface_name:
641
return value.__get__(self)
556
for name in (property_name,
557
property_name + u"_dbus_property"):
558
prop = getattr(self, name, None)
560
or not self._is_dbus_property(prop)
561
or prop._dbus_name != property_name
562
or (interface_name and prop._dbus_interface
563
and interface_name != prop._dbus_interface)):
643
566
# No such property
644
raise DBusPropertyNotFound(self.dbus_object_path + ":"
645
+ interface_name + "."
567
raise DBusPropertyNotFound(self.dbus_object_path + u":"
568
+ interface_name + u"."
648
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
571
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ss",
650
573
def Get(self, interface_name, property_name):
651
574
"""Standard D-Bus property Get() method, see D-Bus standard.
653
576
prop = self._get_dbus_property(interface_name, property_name)
654
if prop._dbus_access == "write":
577
if prop._dbus_access == u"write":
655
578
raise DBusPropertyAccessException(property_name)
657
if not hasattr(value, "variant_level"):
580
if not hasattr(value, u"variant_level"):
659
582
return type(value)(value, variant_level=value.variant_level+1)
661
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
584
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ssv")
662
585
def Set(self, interface_name, property_name, value):
663
586
"""Standard D-Bus property Set() method, see D-Bus standard.
665
588
prop = self._get_dbus_property(interface_name, property_name)
666
if prop._dbus_access == "read":
589
if prop._dbus_access == u"read":
667
590
raise DBusPropertyAccessException(property_name)
668
if prop._dbus_get_args_options["byte_arrays"]:
669
# The byte_arrays option is not supported yet on
670
# signatures other than "ay".
671
if prop._dbus_signature != "ay":
591
if prop._dbus_get_args_options[u"byte_arrays"]:
673
592
value = dbus.ByteArray(''.join(unichr(byte)
674
593
for byte in value))
677
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
678
out_signature="a{sv}")
596
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"s",
597
out_signature=u"a{sv}")
679
598
def GetAll(self, interface_name):
680
599
"""Standard D-Bus property GetAll() method, see D-Bus
683
602
Note: Will not include properties with access="write".
712
631
document = xml.dom.minidom.parseString(xmlstring)
713
632
def make_tag(document, name, prop):
714
e = document.createElement("property")
715
e.setAttribute("name", name)
716
e.setAttribute("type", prop._dbus_signature)
717
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)
719
for if_tag in document.getElementsByTagName("interface"):
638
for if_tag in document.getElementsByTagName(u"interface"):
720
639
for tag in (make_tag(document, name, prop)
722
641
in self._get_all_dbus_properties()
723
642
if prop._dbus_interface
724
== if_tag.getAttribute("name")):
643
== if_tag.getAttribute(u"name")):
725
644
if_tag.appendChild(tag)
726
645
# Add the names to the return values for the
727
646
# "org.freedesktop.DBus.Properties" methods
728
if (if_tag.getAttribute("name")
729
== "org.freedesktop.DBus.Properties"):
730
for cn in if_tag.getElementsByTagName("method"):
731
if cn.getAttribute("name") == "Get":
732
for arg in cn.getElementsByTagName("arg"):
733
if (arg.getAttribute("direction")
735
arg.setAttribute("name", "value")
736
elif cn.getAttribute("name") == "GetAll":
737
for arg in cn.getElementsByTagName("arg"):
738
if (arg.getAttribute("direction")
740
arg.setAttribute("name", "props")
741
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")
742
661
document.unlink()
743
662
except (AttributeError, xml.dom.DOMException,
744
xml.parsers.expat.ExpatError) as error:
745
logger.error("Failed to override Introspection method",
663
xml.parsers.expat.ExpatError), error:
664
logger.error(u"Failed to override Introspection method",
750
def datetime_to_dbus (dt, variant_level=0):
751
"""Convert a UTC datetime.datetime() to a D-Bus type."""
753
return dbus.String("", variant_level = variant_level)
754
return dbus.String(dt.isoformat(),
755
variant_level=variant_level)
757
class transitional_dbus_metaclass(DBusObjectWithProperties.__metaclass__):
758
def __new__(mcs, name, bases, attr):
759
for attrname, old_dbusobj in inspect.getmembers(bases[0]):
760
new_interface = getattr(old_dbusobj, "_dbus_interface", "").replace("se.bsnet.fukt.", "se.recompile.")
761
if (getattr(old_dbusobj, "_dbus_is_signal", False)
762
and old_dbusobj._dbus_interface.startswith("se.bsnet.fukt.Mandos")):
763
unwrappedfunc = dict(zip(old_dbusobj.func_code.co_freevars,
764
old_dbusobj.__closure__))["func"].cell_contents
765
newfunc = types.FunctionType(unwrappedfunc.func_code,
766
unwrappedfunc.func_globals,
767
unwrappedfunc.func_name,
768
unwrappedfunc.func_defaults,
769
unwrappedfunc.func_closure)
770
new_dbusfunc = dbus.service.signal(
771
new_interface, old_dbusobj._dbus_signature)(newfunc)
772
attr["_transitional_" + attrname] = new_dbusfunc
774
def fixscope(func1, func2):
775
def newcall(*args, **kwargs):
776
func1(*args, **kwargs)
777
func2(*args, **kwargs)
780
attr[attrname] = fixscope(old_dbusobj, new_dbusfunc)
782
elif (getattr(old_dbusobj, "_dbus_is_method", False)
783
and old_dbusobj._dbus_interface.startswith("se.bsnet.fukt.Mandos")):
784
new_dbusfunc = (dbus.service.method
786
old_dbusobj._dbus_in_signature,
787
old_dbusobj._dbus_out_signature)
789
(old_dbusobj.func_code,
790
old_dbusobj.func_globals,
791
old_dbusobj.func_name,
792
old_dbusobj.func_defaults,
793
old_dbusobj.func_closure)))
795
attr[attrname] = new_dbusfunc
796
elif (getattr(old_dbusobj, "_dbus_is_property", False)
797
and old_dbusobj._dbus_interface.startswith("se.bsnet.fukt.Mandos")):
798
new_dbusfunc = (dbus_service_property
800
old_dbusobj._dbus_signature,
801
old_dbusobj._dbus_access,
802
old_dbusobj._dbus_get_args_options["byte_arrays"])
804
(old_dbusobj.func_code,
805
old_dbusobj.func_globals,
806
old_dbusobj.func_name,
807
old_dbusobj.func_defaults,
808
old_dbusobj.func_closure)))
810
attr[attrname] = new_dbusfunc
811
return type.__new__(mcs, name, bases, attr)
813
669
class ClientDBus(Client, DBusObjectWithProperties):
814
670
"""A Client class using D-Bus
817
673
dbus_object_path: dbus.ObjectPath
818
674
bus: dbus.SystemBus()
821
runtime_expansions = (Client.runtime_expansions
822
+ ("dbus_object_path",))
824
676
# dbus.service.Object doesn't use super(), so we can't either.
826
678
def __init__(self, bus = None, *args, **kwargs):
827
self._approvals_pending = 0
829
680
Client.__init__(self, *args, **kwargs)
830
681
# Only now, when this client is initialized, can it show up on
832
client_object_name = unicode(self.name).translate(
835
683
self.dbus_object_path = (dbus.ObjectPath
836
("/clients/" + client_object_name))
685
+ self.name.replace(u".", u"_")))
837
686
DBusObjectWithProperties.__init__(self, self.bus,
838
687
self.dbus_object_path)
840
def notifychangeproperty(transform_func,
841
dbus_name, type_func=lambda x: x,
843
""" Modify a variable so that its a property that announce its
845
transform_fun: Function that takes a value and transform it to
847
dbus_name: DBus name of the variable
848
type_func: Function that transform the value before sending it
850
variant_level: DBus variant level. default: 1
853
def setter(self, value):
854
old_value = real_value[0]
855
real_value[0] = value
856
if hasattr(self, "dbus_object_path"):
857
if type_func(old_value) != type_func(real_value[0]):
858
dbus_value = transform_func(type_func(real_value[0]),
860
self.PropertyChanged(dbus.String(dbus_name),
863
return property(lambda self: real_value[0], setter)
866
expires = notifychangeproperty(datetime_to_dbus, "Expires")
867
approvals_pending = notifychangeproperty(dbus.Boolean,
870
enabled = notifychangeproperty(dbus.Boolean, "Enabled")
871
last_enabled = notifychangeproperty(datetime_to_dbus,
873
checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
874
type_func = lambda checker: checker is not None)
875
last_checked_ok = notifychangeproperty(datetime_to_dbus,
877
last_approval_request = notifychangeproperty(datetime_to_dbus,
878
"LastApprovalRequest")
879
approved_by_default = notifychangeproperty(dbus.Boolean,
881
approval_delay = notifychangeproperty(dbus.UInt16, "ApprovalDelay",
882
type_func = _timedelta_to_milliseconds)
883
approval_duration = notifychangeproperty(dbus.UInt16, "ApprovalDuration",
884
type_func = _timedelta_to_milliseconds)
885
host = notifychangeproperty(dbus.String, "Host")
886
timeout = notifychangeproperty(dbus.UInt16, "Timeout",
887
type_func = _timedelta_to_milliseconds)
888
extended_timeout = notifychangeproperty(dbus.UInt16, "ExtendedTimeout",
889
type_func = _timedelta_to_milliseconds)
890
interval = notifychangeproperty(dbus.UInt16, "Interval",
891
type_func = _timedelta_to_milliseconds)
892
checker_command = notifychangeproperty(dbus.String, "Checker")
894
del notifychangeproperty
690
def _datetime_to_dbus(dt, variant_level=0):
691
"""Convert a UTC datetime.datetime() to a D-Bus type."""
692
return dbus.String(dt.isoformat(),
693
variant_level=variant_level)
696
oldstate = getattr(self, u"enabled", False)
697
r = Client.enable(self)
698
if oldstate != self.enabled:
700
self.PropertyChanged(dbus.String(u"enabled"),
701
dbus.Boolean(True, variant_level=1))
702
self.PropertyChanged(
703
dbus.String(u"last_enabled"),
704
self._datetime_to_dbus(self.last_enabled,
708
def disable(self, signal = True):
709
oldstate = getattr(self, u"enabled", False)
710
r = Client.disable(self)
711
if signal and oldstate != self.enabled:
713
self.PropertyChanged(dbus.String(u"enabled"),
714
dbus.Boolean(False, variant_level=1))
896
717
def __del__(self, *args, **kwargs):
898
719
self.remove_from_connection()
899
720
except LookupError:
901
if hasattr(DBusObjectWithProperties, "__del__"):
722
if hasattr(DBusObjectWithProperties, u"__del__"):
902
723
DBusObjectWithProperties.__del__(self, *args, **kwargs)
903
724
Client.__del__(self, *args, **kwargs)
933
766
and old_checker_pid != self.checker.pid):
934
767
# Emit D-Bus signal
935
768
self.CheckerStarted(self.current_checker_command)
938
def _reset_approved(self):
939
self._approved = None
942
def approve(self, value=True):
943
self.send_changedstate()
944
self._approved = value
945
gobject.timeout_add(_timedelta_to_milliseconds
946
(self.approval_duration),
947
self._reset_approved)
950
## D-Bus methods, signals & properties
951
_interface = "se.bsnet.fukt.Mandos.Client"
769
self.PropertyChanged(
770
dbus.String(u"checker_running"),
771
dbus.Boolean(True, variant_level=1))
774
def stop_checker(self, *args, **kwargs):
775
old_checker = getattr(self, u"checker", None)
776
r = Client.stop_checker(self, *args, **kwargs)
777
if (old_checker is not None
778
and getattr(self, u"checker", None) is None):
779
self.PropertyChanged(dbus.String(u"checker_running"),
780
dbus.Boolean(False, variant_level=1))
783
## D-Bus methods & signals
784
_interface = u"se.bsnet.fukt.Mandos.Client"
787
@dbus.service.method(_interface)
789
return self.checked_ok()
955
791
# CheckerCompleted - signal
956
@dbus.service.signal(_interface, signature="nxs")
792
@dbus.service.signal(_interface, signature=u"nxs")
957
793
def CheckerCompleted(self, exitcode, waitstatus, command):
961
797
# CheckerStarted - signal
962
@dbus.service.signal(_interface, signature="s")
798
@dbus.service.signal(_interface, signature=u"s")
963
799
def CheckerStarted(self, command):
967
803
# PropertyChanged - signal
968
@dbus.service.signal(_interface, signature="sv")
804
@dbus.service.signal(_interface, signature=u"sv")
969
805
def PropertyChanged(self, property, value):
1026
841
def StopChecker(self):
1027
842
self.stop_checker()
1031
# ApprovalPending - property
1032
@dbus_service_property(_interface, signature="b", access="read")
1033
def ApprovalPending_dbus_property(self):
1034
return dbus.Boolean(bool(self.approvals_pending))
1036
# ApprovedByDefault - property
1037
@dbus_service_property(_interface, signature="b",
1039
def ApprovedByDefault_dbus_property(self, value=None):
1040
if value is None: # get
1041
return dbus.Boolean(self.approved_by_default)
1042
self.approved_by_default = bool(value)
1044
# ApprovalDelay - property
1045
@dbus_service_property(_interface, signature="t",
1047
def ApprovalDelay_dbus_property(self, value=None):
1048
if value is None: # get
1049
return dbus.UInt64(self.approval_delay_milliseconds())
1050
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1052
# ApprovalDuration - property
1053
@dbus_service_property(_interface, signature="t",
1055
def ApprovalDuration_dbus_property(self, value=None):
1056
if value is None: # get
1057
return dbus.UInt64(_timedelta_to_milliseconds(
1058
self.approval_duration))
1059
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1062
@dbus_service_property(_interface, signature="s", access="read")
1063
def Name_dbus_property(self):
845
@dbus_service_property(_interface, signature=u"s", access=u"read")
846
def name_dbus_property(self):
1064
847
return dbus.String(self.name)
1066
# Fingerprint - property
1067
@dbus_service_property(_interface, signature="s", access="read")
1068
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):
1069
852
return dbus.String(self.fingerprint)
1072
@dbus_service_property(_interface, signature="s",
1074
def Host_dbus_property(self, value=None):
855
@dbus_service_property(_interface, signature=u"s",
857
def host_dbus_property(self, value=None):
1075
858
if value is None: # get
1076
859
return dbus.String(self.host)
1077
860
self.host = value
1079
# Created - property
1080
@dbus_service_property(_interface, signature="s", access="read")
1081
def Created_dbus_property(self):
1082
return dbus.String(datetime_to_dbus(self.created))
1084
# LastEnabled - property
1085
@dbus_service_property(_interface, signature="s", access="read")
1086
def LastEnabled_dbus_property(self):
1087
return datetime_to_dbus(self.last_enabled)
1089
# Enabled - property
1090
@dbus_service_property(_interface, signature="b",
1092
def Enabled_dbus_property(self, value=None):
862
self.PropertyChanged(dbus.String(u"host"),
863
dbus.String(value, variant_level=1))
866
@dbus_service_property(_interface, signature=u"s", access=u"read")
867
def created_dbus_property(self):
868
return dbus.String(self._datetime_to_dbus(self.created))
870
# last_enabled - property
871
@dbus_service_property(_interface, signature=u"s", access=u"read")
872
def last_enabled_dbus_property(self):
873
if self.last_enabled is None:
874
return dbus.String(u"")
875
return dbus.String(self._datetime_to_dbus(self.last_enabled))
878
@dbus_service_property(_interface, signature=u"b",
880
def enabled_dbus_property(self, value=None):
1093
881
if value is None: # get
1094
882
return dbus.Boolean(self.enabled)
1100
# LastCheckedOK - property
1101
@dbus_service_property(_interface, signature="s",
1103
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):
1104
892
if value is not None:
1105
893
self.checked_ok()
1107
return datetime_to_dbus(self.last_checked_ok)
1109
# Expires - property
1110
@dbus_service_property(_interface, signature="s", access="read")
1111
def Expires_dbus_property(self):
1112
return datetime_to_dbus(self.expires)
1114
# LastApprovalRequest - property
1115
@dbus_service_property(_interface, signature="s", access="read")
1116
def LastApprovalRequest_dbus_property(self):
1117
return datetime_to_dbus(self.last_approval_request)
1119
# Timeout - property
1120
@dbus_service_property(_interface, signature="t",
1122
def Timeout_dbus_property(self, value=None):
895
if self.last_checked_ok is None:
896
return dbus.String(u"")
897
return dbus.String(self._datetime_to_dbus(self
901
@dbus_service_property(_interface, signature=u"t",
903
def timeout_dbus_property(self, value=None):
1123
904
if value is None: # get
1124
905
return dbus.UInt64(self.timeout_milliseconds())
1125
906
self.timeout = datetime.timedelta(0, 0, 0, value)
1126
if getattr(self, "disable_initiator_tag", None) is None:
908
self.PropertyChanged(dbus.String(u"timeout"),
909
dbus.UInt64(value, variant_level=1))
910
if getattr(self, u"disable_initiator_tag", None) is None:
1128
912
# Reschedule timeout
1129
913
gobject.source_remove(self.disable_initiator_tag)
1130
914
self.disable_initiator_tag = None
1132
915
time_to_die = (self.
1133
916
_timedelta_to_milliseconds((self
1134
917
.last_checked_ok
1139
922
# The timeout has passed
1142
self.expires = (datetime.datetime.utcnow()
1143
+ datetime.timedelta(milliseconds = time_to_die))
1144
925
self.disable_initiator_tag = (gobject.timeout_add
1145
926
(time_to_die, self.disable))
1147
# ExtendedTimeout - property
1148
@dbus_service_property(_interface, signature="t",
1150
def ExtendedTimeout_dbus_property(self, value=None):
1151
if value is None: # get
1152
return dbus.UInt64(self.extended_timeout_milliseconds())
1153
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1155
# Interval - property
1156
@dbus_service_property(_interface, signature="t",
1158
def Interval_dbus_property(self, value=None):
928
# interval - property
929
@dbus_service_property(_interface, signature=u"t",
931
def interval_dbus_property(self, value=None):
1159
932
if value is None: # get
1160
933
return dbus.UInt64(self.interval_milliseconds())
1161
934
self.interval = datetime.timedelta(0, 0, 0, value)
1162
if getattr(self, "checker_initiator_tag", None) is None:
936
self.PropertyChanged(dbus.String(u"interval"),
937
dbus.UInt64(value, variant_level=1))
938
if getattr(self, u"checker_initiator_tag", None) is None:
1164
940
# Reschedule checker run
1165
941
gobject.source_remove(self.checker_initiator_tag)
1166
942
self.checker_initiator_tag = (gobject.timeout_add
1167
943
(value, self.start_checker))
1168
944
self.start_checker() # Start one now, too
1170
# Checker - property
1171
@dbus_service_property(_interface, signature="s",
1173
def Checker_dbus_property(self, value=None):
947
@dbus_service_property(_interface, signature=u"s",
949
def checker_dbus_property(self, value=None):
1174
950
if value is None: # get
1175
951
return dbus.String(self.checker_command)
1176
952
self.checker_command = value
954
self.PropertyChanged(dbus.String(u"checker"),
955
dbus.String(self.checker_command,
1178
# CheckerRunning - property
1179
@dbus_service_property(_interface, signature="b",
1181
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):
1182
962
if value is None: # get
1183
963
return dbus.Boolean(self.checker is not None)
1187
967
self.stop_checker()
1189
# ObjectPath - property
1190
@dbus_service_property(_interface, signature="o", access="read")
1191
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):
1192
972
return self.dbus_object_path # is already a dbus.ObjectPath
1195
@dbus_service_property(_interface, signature="ay",
1196
access="write", byte_arrays=True)
1197
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):
1198
978
self.secret = str(value)
1203
class ProxyClient(object):
1204
def __init__(self, child_pipe, fpr, address):
1205
self._pipe = child_pipe
1206
self._pipe.send(('init', fpr, address))
1207
if not self._pipe.recv():
1210
def __getattribute__(self, name):
1211
if(name == '_pipe'):
1212
return super(ProxyClient, self).__getattribute__(name)
1213
self._pipe.send(('getattr', name))
1214
data = self._pipe.recv()
1215
if data[0] == 'data':
1217
if data[0] == 'function':
1218
def func(*args, **kwargs):
1219
self._pipe.send(('funcall', name, args, kwargs))
1220
return self._pipe.recv()[1]
1223
def __setattr__(self, name, value):
1224
if(name == '_pipe'):
1225
return super(ProxyClient, self).__setattr__(name, value)
1226
self._pipe.send(('setattr', name, value))
1228
class ClientDBusTransitional(ClientDBus):
1229
__metaclass__ = transitional_dbus_metaclass
1231
983
class ClientHandler(socketserver.BaseRequestHandler, object):
1232
984
"""A class to handle client connections.
1235
987
Note: This will run in its own forked process."""
1237
989
def handle(self):
1238
with contextlib.closing(self.server.child_pipe) as child_pipe:
1239
logger.info("TCP connection from: %s",
1240
unicode(self.client_address))
1241
logger.debug("Pipe FD: %d",
1242
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:
1244
995
session = (gnutls.connection
1245
996
.ClientSession(self.request,
1246
997
gnutls.connection
1247
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)
1249
1009
# Note: gnutls.connection.X509Credentials is really a
1250
1010
# generic GnuTLS certificate credentials object so long as
1251
1011
# no X.509 keys are added to it. Therefore, we can use it
1252
1012
# here despite using OpenPGP certificates.
1254
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1255
# "+AES-256-CBC", "+SHA1",
1256
# "+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",
1258
1018
# Use a fallback default, since this MUST be set.
1259
1019
priority = self.server.gnutls_priority
1260
1020
if priority is None:
1021
priority = u"NORMAL"
1262
1022
(gnutls.library.functions
1263
1023
.gnutls_priority_set_direct(session._c_object,
1264
1024
priority, None))
1266
# Start communication using the Mandos protocol
1267
# Get protocol number
1268
line = self.request.makefile().readline()
1269
logger.debug("Protocol version: %r", line)
1271
if int(line.strip().split()[0]) > 1:
1273
except (ValueError, IndexError, RuntimeError) as error:
1274
logger.error("Unknown protocol version: %s", error)
1277
# Start GnuTLS connection
1279
1027
session.handshake()
1280
except gnutls.errors.GNUTLSError as error:
1281
logger.warning("Handshake failed: %s", error)
1028
except gnutls.errors.GNUTLSError, error:
1029
logger.warning(u"Handshake failed: %s", error)
1282
1030
# Do not run session.bye() here: the session is not
1283
1031
# established. Just abandon the request.
1285
logger.debug("Handshake succeeded")
1287
approval_required = False
1033
logger.debug(u"Handshake succeeded")
1290
fpr = self.fingerprint(self.peer_certificate
1293
gnutls.errors.GNUTLSError) as error:
1294
logger.warning("Bad certificate: %s", error)
1296
logger.debug("Fingerprint: %s", fpr)
1299
client = ProxyClient(child_pipe, fpr,
1300
self.client_address)
1304
if client.approval_delay:
1305
delay = client.approval_delay
1306
client.approvals_pending += 1
1307
approval_required = True
1310
if not client.enabled:
1311
logger.info("Client %s is disabled",
1313
if self.server.use_dbus:
1315
client.Rejected("Disabled")
1318
if client._approved or not client.approval_delay:
1319
#We are approved or approval is disabled
1321
elif client._approved is None:
1322
logger.info("Client %s needs approval",
1324
if self.server.use_dbus:
1326
client.NeedApproval(
1327
client.approval_delay_milliseconds(),
1328
client.approved_by_default)
1330
logger.warning("Client %s was not approved",
1332
if self.server.use_dbus:
1334
client.Rejected("Denied")
1337
#wait until timeout or approved
1338
#x = float(client._timedelta_to_milliseconds(delay))
1339
time = datetime.datetime.now()
1340
client.changedstate.acquire()
1341
client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
1342
client.changedstate.release()
1343
time2 = datetime.datetime.now()
1344
if (time2 - time) >= delay:
1345
if not client.approved_by_default:
1346
logger.warning("Client %s timed out while"
1347
" waiting for approval",
1349
if self.server.use_dbus:
1351
client.Rejected("Approval timed out")
1356
delay -= time2 - time
1359
while sent_size < len(client.secret):
1361
sent = session.send(client.secret[sent_size:])
1362
except gnutls.errors.GNUTLSError as error:
1363
logger.warning("gnutls send failed")
1365
logger.debug("Sent: %d, remaining: %d",
1366
sent, len(client.secret)
1367
- (sent_size + sent))
1370
logger.info("Sending secret to %s", client.name)
1371
# bump the timeout as if seen
1372
client.checked_ok(client.extended_timeout)
1373
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)
1378
if approval_required:
1379
client.approvals_pending -= 1
1382
except gnutls.errors.GNUTLSError as error:
1383
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))
1386
1069
def peer_certificate(session):
1442
1125
# Convert the buffer to a Python bytestring
1443
1126
fpr = ctypes.string_at(buf, buf_len.value)
1444
1127
# Convert the bytestring to hexadecimal notation
1445
hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
1128
hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
1449
class MultiprocessingMixIn(object):
1450
"""Like socketserver.ThreadingMixIn, but with multiprocessing"""
1451
def sub_process_main(self, request, address):
1453
self.finish_request(request, address)
1455
self.handle_error(request, address)
1456
self.close_request(request)
1458
def process_request(self, request, address):
1459
"""Start a new process to process the request."""
1460
multiprocessing.Process(target = self.sub_process_main,
1461
args = (request, address)).start()
1464
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1465
""" adds a pipe to the MixIn """
1132
class ForkingMixInWithPipe(socketserver.ForkingMixIn, object):
1133
"""Like socketserver.ForkingMixIn, but also pass a pipe."""
1466
1134
def process_request(self, request, client_address):
1467
1135
"""Overrides and wraps the original process_request().
1469
1137
This function creates a new pipe in self.pipe
1471
parent_pipe, self.child_pipe = multiprocessing.Pipe()
1473
super(MultiprocessingMixInWithPipe,
1139
self.pipe = os.pipe()
1140
super(ForkingMixInWithPipe,
1474
1141
self).process_request(request, client_address)
1475
self.child_pipe.close()
1476
self.add_pipe(parent_pipe)
1478
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):
1479
1145
"""Dummy function; override as necessary"""
1480
raise NotImplementedError
1483
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1149
class IPv6_TCPServer(ForkingMixInWithPipe,
1484
1150
socketserver.TCPServer, object):
1485
1151
"""IPv6-capable TCP server. Accepts 'None' as address and/or port
1571
1237
return socketserver.TCPServer.server_activate(self)
1572
1238
def enable(self):
1573
1239
self.enabled = True
1574
def add_pipe(self, parent_pipe):
1240
def add_pipe(self, pipe):
1575
1241
# Call "handle_ipc" for both data and EOF events
1576
gobject.io_add_watch(parent_pipe.fileno(),
1577
gobject.IO_IN | gobject.IO_HUP,
1578
functools.partial(self.handle_ipc,
1579
parent_pipe = parent_pipe))
1581
def handle_ipc(self, source, condition, parent_pipe=None,
1582
client_object=None):
1242
gobject.io_add_watch(pipe, gobject.IO_IN | gobject.IO_HUP,
1244
def handle_ipc(self, source, condition, file_objects={}):
1583
1245
condition_names = {
1584
gobject.IO_IN: "IN", # There is data to read.
1585
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
1587
gobject.IO_PRI: "PRI", # There is urgent data to read.
1588
gobject.IO_ERR: "ERR", # Error condition.
1589
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
1590
1252
# broken, usually for pipes and
1594
1256
for cond, name in
1595
1257
condition_names.iteritems()
1596
1258
if cond & condition)
1597
# error or the other end of multiprocessing.Pipe has closed
1598
if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
1601
# Read a request from the child
1602
request = parent_pipe.recv()
1603
command = request[0]
1605
if command == 'init':
1607
address = request[2]
1609
for c in self.clients:
1610
if c.fingerprint == fpr:
1614
logger.info("Client not found for fingerprint: %s, ad"
1615
"dress: %s", fpr, address)
1618
mandos_dbus_service.ClientNotFound(fpr, address[0])
1619
parent_pipe.send(False)
1622
gobject.io_add_watch(parent_pipe.fileno(),
1623
gobject.IO_IN | gobject.IO_HUP,
1624
functools.partial(self.handle_ipc,
1625
parent_pipe = parent_pipe,
1626
client_object = client))
1627
parent_pipe.send(True)
1628
# remove the old hook in favor of the new above hook on same fileno
1630
if command == 'funcall':
1631
funcname = request[1]
1635
parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
1637
if command == 'getattr':
1638
attrname = request[1]
1639
if callable(client_object.__getattribute__(attrname)):
1640
parent_pipe.send(('function',))
1642
parent_pipe.send(('data', client_object.__getattribute__(attrname)))
1644
if command == 'setattr':
1645
attrname = request[1]
1647
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
1652
1316
def string_to_delta(interval):
1653
1317
"""Parse a string and return a datetime.timedelta
1655
>>> string_to_delta('7d')
1319
>>> string_to_delta(u'7d')
1656
1320
datetime.timedelta(7)
1657
>>> string_to_delta('60s')
1321
>>> string_to_delta(u'60s')
1658
1322
datetime.timedelta(0, 60)
1659
>>> string_to_delta('60m')
1323
>>> string_to_delta(u'60m')
1660
1324
datetime.timedelta(0, 3600)
1661
>>> string_to_delta('24h')
1325
>>> string_to_delta(u'24h')
1662
1326
datetime.timedelta(1)
1663
>>> string_to_delta('1w')
1327
>>> string_to_delta(u'1w')
1664
1328
datetime.timedelta(7)
1665
>>> string_to_delta('5m 30s')
1329
>>> string_to_delta(u'5m 30s')
1666
1330
datetime.timedelta(0, 330)
1668
1332
timevalue = datetime.timedelta(0)
1742
1406
##################################################################
1743
1407
# Parsing of options, both command line and config file
1745
parser = argparse.ArgumentParser()
1746
parser.add_argument("-v", "--version", action="version",
1747
version = "%%(prog)s %s" % version,
1748
help="show version number and exit")
1749
parser.add_argument("-i", "--interface", metavar="IF",
1750
help="Bind to interface IF")
1751
parser.add_argument("-a", "--address",
1752
help="Address to listen for requests on")
1753
parser.add_argument("-p", "--port", type=int,
1754
help="Port number to receive requests on")
1755
parser.add_argument("--check", action="store_true",
1756
help="Run self-test")
1757
parser.add_argument("--debug", action="store_true",
1758
help="Debug mode; run in foreground and log"
1760
parser.add_argument("--debuglevel", metavar="LEVEL",
1761
help="Debug level for stdout output")
1762
parser.add_argument("--priority", help="GnuTLS"
1763
" priority string (see GnuTLS documentation)")
1764
parser.add_argument("--servicename",
1765
metavar="NAME", help="Zeroconf service name")
1766
parser.add_argument("--configdir",
1767
default="/etc/mandos", metavar="DIR",
1768
help="Directory to search for configuration"
1770
parser.add_argument("--no-dbus", action="store_false",
1771
dest="use_dbus", help="Do not provide D-Bus"
1772
" system bus interface")
1773
parser.add_argument("--no-ipv6", action="store_false",
1774
dest="use_ipv6", help="Do not use IPv6")
1775
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]
1777
1436
if options.check:
1782
1441
# Default values for config file for server-global settings
1783
server_defaults = { "interface": "",
1788
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1789
"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",
1795
1453
# Parse config file for server-global settings
1796
1454
server_config = configparser.SafeConfigParser(server_defaults)
1797
1455
del server_defaults
1798
1456
server_config.read(os.path.join(options.configdir,
1800
1458
# Convert the SafeConfigParser object to a dict
1801
1459
server_settings = server_config.defaults()
1802
1460
# Use the appropriate methods on the non-string config options
1803
for option in ("debug", "use_dbus", "use_ipv6"):
1804
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",
1806
1464
if server_settings["port"]:
1807
server_settings["port"] = server_config.getint("DEFAULT",
1465
server_settings["port"] = server_config.getint(u"DEFAULT",
1809
1467
del server_config
1811
1469
# Override the settings from the config file with command line
1812
1470
# options, if set.
1813
for option in ("interface", "address", "port", "debug",
1814
"priority", "servicename", "configdir",
1815
"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"):
1816
1474
value = getattr(options, option)
1817
1475
if value is not None:
1818
1476
server_settings[option] = value
1826
1484
##################################################################
1828
1486
# For convenience
1829
debug = server_settings["debug"]
1830
debuglevel = server_settings["debuglevel"]
1831
use_dbus = server_settings["use_dbus"]
1832
use_ipv6 = server_settings["use_ipv6"]
1834
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":
1835
1496
syslogger.setFormatter(logging.Formatter
1836
('Mandos (%s) [%%(process)d]:'
1837
' %%(levelname)s: %%(message)s'
1838
% server_settings["servicename"]))
1497
(u'Mandos (%s) [%%(process)d]:'
1498
u' %%(levelname)s: %%(message)s'
1499
% server_settings[u"servicename"]))
1840
1501
# Parse config file with clients
1841
client_defaults = { "timeout": "5m",
1842
"extended_timeout": "15m",
1844
"checker": "fping -q -- %%(host)s",
1846
"approval_delay": "0s",
1847
"approval_duration": "1s",
1502
client_defaults = { u"timeout": u"1h",
1504
u"checker": u"fping -q -- %%(host)s",
1849
1507
client_config = configparser.SafeConfigParser(client_defaults)
1850
client_config.read(os.path.join(server_settings["configdir"],
1508
client_config.read(os.path.join(server_settings[u"configdir"],
1853
1511
global mandos_dbus_service
1854
1512
mandos_dbus_service = None
1856
tcp_server = MandosServer((server_settings["address"],
1857
server_settings["port"]),
1514
tcp_server = MandosServer((server_settings[u"address"],
1515
server_settings[u"port"]),
1859
interface=(server_settings["interface"]
1517
interface=server_settings[u"interface"],
1861
1518
use_ipv6=use_ipv6,
1862
1519
gnutls_priority=
1863
server_settings["priority"],
1520
server_settings[u"priority"],
1864
1521
use_dbus=use_dbus)
1866
pidfilename = "/var/run/mandos.pid"
1868
pidfile = open(pidfilename, "w")
1870
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)
1873
uid = pwd.getpwnam("_mandos").pw_uid
1874
gid = pwd.getpwnam("_mandos").pw_gid
1529
uid = pwd.getpwnam(u"_mandos").pw_uid
1530
gid = pwd.getpwnam(u"_mandos").pw_gid
1875
1531
except KeyError:
1877
uid = pwd.getpwnam("mandos").pw_uid
1878
gid = pwd.getpwnam("mandos").pw_gid
1533
uid = pwd.getpwnam(u"mandos").pw_uid
1534
gid = pwd.getpwnam(u"mandos").pw_gid
1879
1535
except KeyError:
1881
uid = pwd.getpwnam("nobody").pw_uid
1882
gid = pwd.getpwnam("nobody").pw_gid
1537
uid = pwd.getpwnam(u"nobody").pw_uid
1538
gid = pwd.getpwnam(u"nobody").pw_gid
1883
1539
except KeyError:
1889
except OSError as error:
1545
except OSError, error:
1890
1546
if error[0] != errno.EPERM:
1893
if not debug and not debuglevel:
1894
syslogger.setLevel(logging.WARNING)
1895
console.setLevel(logging.WARNING)
1897
level = getattr(logging, debuglevel.upper())
1898
syslogger.setLevel(level)
1899
console.setLevel(level)
1549
# Enable all possible GnuTLS debugging
1902
# Enable all possible GnuTLS debugging
1904
1551
# "Use a log level over 10 to enable all debugging options."
1905
1552
# - GnuTLS manual
1906
1553
gnutls.library.functions.gnutls_global_set_log_level(11)
1908
1555
@gnutls.library.types.gnutls_log_func
1909
1556
def debug_gnutls(level, string):
1910
logger.debug("GnuTLS: %s", string[:-1])
1557
logger.debug(u"GnuTLS: %s", string[:-1])
1912
1559
(gnutls.library.functions
1913
1560
.gnutls_global_set_log_function(debug_gnutls))
1915
# Redirect stdin so all checkers get /dev/null
1916
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1917
os.dup2(null, sys.stdin.fileno())
1921
# No console logging
1922
logger.removeHandler(console)
1924
# Need to fork before connecting to D-Bus
1926
# Close all input and output, do double fork, etc.
1929
1562
global main_loop
1930
1563
# From the Avahi example code
1933
1566
bus = dbus.SystemBus()
1934
1567
# End of Avahi example code
1937
bus_name = dbus.service.BusName("se.recompile.Mandos",
1938
bus, do_not_queue=True)
1939
bus_name_transitional = dbus.service.BusName("se.bsnet.fukt.Mandos",
1940
bus, do_not_queue=True)
1941
except dbus.exceptions.NameExistsException as e:
1942
logger.error(unicode(e) + ", disabling D-Bus")
1944
server_settings["use_dbus"] = False
1945
tcp_server.use_dbus = False
1569
bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos", bus)
1946
1570
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1947
service = AvahiService(name = server_settings["servicename"],
1948
servicetype = "_mandos._tcp",
1571
service = AvahiService(name = server_settings[u"servicename"],
1572
servicetype = u"_mandos._tcp",
1949
1573
protocol = protocol, bus = bus)
1950
1574
if server_settings["interface"]:
1951
1575
service.interface = (if_nametoindex
1952
(str(server_settings["interface"])))
1954
global multiprocessing_manager
1955
multiprocessing_manager = multiprocessing.Manager()
1576
(str(server_settings[u"interface"])))
1957
1578
client_class = Client
1959
client_class = functools.partial(ClientDBusTransitional, bus = bus)
1960
def client_config_items(config, section):
1961
special_settings = {
1962
"approved_by_default":
1963
lambda: config.getboolean(section,
1964
"approved_by_default"),
1966
for name, value in config.items(section):
1968
yield (name, special_settings[name]())
1580
client_class = functools.partial(ClientDBus, bus = bus)
1972
1581
tcp_server.clients.update(set(
1973
1582
client_class(name = section,
1974
config= dict(client_config_items(
1975
client_config, section)))
1583
config= dict(client_config.items(section)))
1976
1584
for section in client_config.sections()))
1977
1585
if not tcp_server.clients:
1978
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)
1984
pidfile.write(str(pid) + "\n".encode("utf-8"))
1987
logger.error("Could not write to file %r with PID %d",
1990
# "pidfile" was never created
1994
1625
signal.signal(signal.SIGINT, signal.SIG_IGN)
1996
1626
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1997
1627
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2000
1630
class MandosDBusService(dbus.service.Object):
2001
1631
"""A D-Bus proxy object"""
2002
1632
def __init__(self):
2003
dbus.service.Object.__init__(self, bus, "/")
2004
_interface = "se.bsnet.fukt.Mandos"
2006
@dbus.service.signal(_interface, signature="o")
2007
def ClientAdded(self, objpath):
2011
@dbus.service.signal(_interface, signature="ss")
2012
def ClientNotFound(self, fingerprint, address):
2016
@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")
2017
1647
def ClientRemoved(self, objpath, name):
2021
@dbus.service.method(_interface, out_signature="ao")
1651
@dbus.service.method(_interface, out_signature=u"ao")
2022
1652
def GetAllClients(self):
2024
1654
return dbus.Array(c.dbus_object_path
2025
1655
for c in tcp_server.clients)
2027
1657
@dbus.service.method(_interface,
2028
out_signature="a{oa{sv}}")
1658
out_signature=u"a{oa{sv}}")
2029
1659
def GetAllClientsWithProperties(self):
2031
1661
return dbus.Dictionary(
2032
((c.dbus_object_path, c.GetAll(""))
1662
((c.dbus_object_path, c.GetAll(u""))
2033
1663
for c in tcp_server.clients),
1664
signature=u"oa{sv}")
2036
@dbus.service.method(_interface, in_signature="o")
1666
@dbus.service.method(_interface, in_signature=u"o")
2037
1667
def RemoveClient(self, object_path):
2039
1669
for c in tcp_server.clients: