152
150
self.group = None # our entry group
153
151
self.server = None
155
self.entry_group_state_changed_match = None
156
153
def rename(self):
157
154
"""Derived from the Avahi example code"""
158
155
if self.rename_count >= self.max_renames:
159
logger.critical("No suitable Zeroconf service name found"
160
" after %i retries, exiting.",
156
logger.critical(u"No suitable Zeroconf service name found"
157
u" after %i retries, exiting.",
161
158
self.rename_count)
162
raise AvahiServiceError("Too many renames")
163
self.name = unicode(self.server
164
.GetAlternativeServiceName(self.name))
165
logger.info("Changing Zeroconf service name to %r ...",
159
raise AvahiServiceError(u"Too many renames")
160
self.name = unicode(self.server.GetAlternativeServiceName(self.name))
161
logger.info(u"Changing Zeroconf service name to %r ...",
167
163
syslogger.setFormatter(logging.Formatter
168
('Mandos (%s) [%%(process)d]:'
169
' %%(levelname)s: %%(message)s'
164
(u'Mandos (%s) [%%(process)d]:'
165
u' %%(levelname)s: %%(message)s'
174
except dbus.exceptions.DBusException as error:
175
logger.critical("DBusException: %s", error)
178
169
self.rename_count += 1
179
170
def remove(self):
180
171
"""Derived from the Avahi example code"""
181
if self.entry_group_state_changed_match is not None:
182
self.entry_group_state_changed_match.remove()
183
self.entry_group_state_changed_match = None
184
172
if self.group is not None:
185
173
self.group.Reset()
187
175
"""Derived from the Avahi example code"""
189
176
if self.group is None:
190
177
self.group = dbus.Interface(
191
178
self.bus.get_object(avahi.DBUS_NAME,
192
179
self.server.EntryGroupNew()),
193
180
avahi.DBUS_INTERFACE_ENTRY_GROUP)
194
self.entry_group_state_changed_match = (
195
self.group.connect_to_signal(
196
'StateChanged', self .entry_group_state_changed))
197
logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
181
self.group.connect_to_signal('StateChanged',
183
.entry_group_state_changed)
184
logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
198
185
self.name, self.type)
199
186
self.group.AddService(
207
194
self.group.Commit()
208
195
def entry_group_state_changed(self, state, error):
209
196
"""Derived from the Avahi example code"""
210
logger.debug("Avahi entry group state change: %i", state)
197
logger.debug(u"Avahi entry group state change: %i", state)
212
199
if state == avahi.ENTRY_GROUP_ESTABLISHED:
213
logger.debug("Zeroconf service established.")
200
logger.debug(u"Zeroconf service established.")
214
201
elif state == avahi.ENTRY_GROUP_COLLISION:
215
logger.info("Zeroconf service name collision.")
202
logger.warning(u"Zeroconf service name collision.")
217
204
elif state == avahi.ENTRY_GROUP_FAILURE:
218
logger.critical("Avahi: Error in group state changed %s",
205
logger.critical(u"Avahi: Error in group state changed %s",
220
raise AvahiGroupError("State changed: %s"
207
raise AvahiGroupError(u"State changed: %s"
221
208
% unicode(error))
222
209
def cleanup(self):
223
210
"""Derived from the Avahi example code"""
224
211
if self.group is not None:
227
except (dbus.exceptions.UnknownMethodException,
228
dbus.exceptions.DBusException) as e:
230
213
self.group = None
232
def server_state_changed(self, state, error=None):
214
def server_state_changed(self, state):
233
215
"""Derived from the Avahi example code"""
234
logger.debug("Avahi server state change: %i", state)
235
bad_states = { avahi.SERVER_INVALID:
236
"Zeroconf server invalid",
237
avahi.SERVER_REGISTERING: None,
238
avahi.SERVER_COLLISION:
239
"Zeroconf server name collision",
240
avahi.SERVER_FAILURE:
241
"Zeroconf server failure" }
242
if state in bad_states:
243
if bad_states[state] is not None:
245
logger.error(bad_states[state])
247
logger.error(bad_states[state] + ": %r", error)
216
logger.debug(u"Avahi server state change: %i", state)
217
if state == avahi.SERVER_COLLISION:
218
logger.error(u"Zeroconf server name collision")
249
220
elif state == avahi.SERVER_RUNNING:
253
logger.debug("Unknown state: %r", state)
255
logger.debug("Unknown state: %r: %r", state, error)
256
222
def activate(self):
257
223
"""Derived from the Avahi example code"""
258
224
if self.server is None:
259
225
self.server = dbus.Interface(
260
226
self.bus.get_object(avahi.DBUS_NAME,
261
avahi.DBUS_PATH_SERVER,
262
follow_name_owner_changes=True),
227
avahi.DBUS_PATH_SERVER),
263
228
avahi.DBUS_INTERFACE_SERVER)
264
self.server.connect_to_signal("StateChanged",
229
self.server.connect_to_signal(u"StateChanged",
265
230
self.server_state_changed)
266
231
self.server_state_changed(self.server.GetState())
269
def _timedelta_to_milliseconds(td):
270
"Convert a datetime.timedelta() to milliseconds"
271
return ((td.days * 24 * 60 * 60 * 1000)
272
+ (td.seconds * 1000)
273
+ (td.microseconds // 1000))
275
234
class Client(object):
276
235
"""A representation of a client host served by this server.
279
_approved: bool(); 'None' if not yet approved/disapproved
280
approval_delay: datetime.timedelta(); Time to wait for approval
281
approval_duration: datetime.timedelta(); Duration of one approval
238
name: string; from the config file, used in log messages and
240
fingerprint: string (40 or 32 hexadecimal digits); used to
241
uniquely identify the client
242
secret: bytestring; sent verbatim (over TLS) to client
243
host: string; available for use by the checker command
244
created: datetime.datetime(); (UTC) object creation
245
last_enabled: datetime.datetime(); (UTC)
247
last_checked_ok: datetime.datetime(); (UTC) or None
248
timeout: datetime.timedelta(); How long from last_checked_ok
249
until this client is disabled
250
interval: datetime.timedelta(); How often to start a new checker
251
disable_hook: If set, called by disable() as disable_hook(self)
282
252
checker: subprocess.Popen(); a running checker process used
283
253
to see if the client lives.
284
254
'None' if no process is running.
285
checker_callback_tag: a gobject event source tag, or None
286
checker_command: string; External command which is run to check
287
if client lives. %() expansions are done at
255
checker_initiator_tag: a gobject event source tag, or None
256
disable_initiator_tag: - '' -
257
checker_callback_tag: - '' -
258
checker_command: string; External command which is run to check if
259
client lives. %() expansions are done at
288
260
runtime with vars(self) as dict, so that for
289
261
instance %(name)s can be used in the command.
290
checker_initiator_tag: a gobject event source tag, or None
291
created: datetime.datetime(); (UTC) object creation
292
262
current_checker_command: string; current running checker_command
293
disable_hook: If set, called by disable() as disable_hook(self)
294
disable_initiator_tag: a gobject event source tag, or None
296
fingerprint: string (40 or 32 hexadecimal digits); used to
297
uniquely identify the client
298
host: string; available for use by the checker command
299
interval: datetime.timedelta(); How often to start a new checker
300
last_approval_request: datetime.datetime(); (UTC) or None
301
last_checked_ok: datetime.datetime(); (UTC) or None
302
last_enabled: datetime.datetime(); (UTC)
303
name: string; from the config file, used in log messages and
305
secret: bytestring; sent verbatim (over TLS) to client
306
timeout: datetime.timedelta(); How long from last_checked_ok
307
until this client is disabled
308
extended_timeout: extra long timeout when password has been sent
309
runtime_expansions: Allowed attributes for runtime expansion.
310
expires: datetime.datetime(); time (UTC) when a client will be
263
approved_delay: datetime.timedelta(); Time to wait for approval
264
_approved: bool(); 'None' if not yet approved/disapproved
265
approved_duration: datetime.timedelta(); Duration of one approval
314
runtime_expansions = ("approval_delay", "approval_duration",
315
"created", "enabled", "fingerprint",
316
"host", "interval", "last_checked_ok",
317
"last_enabled", "name", "timeout")
269
def _timedelta_to_milliseconds(td):
270
"Convert a datetime.timedelta() to milliseconds"
271
return ((td.days * 24 * 60 * 60 * 1000)
272
+ (td.seconds * 1000)
273
+ (td.microseconds // 1000))
319
275
def timeout_milliseconds(self):
320
276
"Return the 'timeout' attribute in milliseconds"
321
return _timedelta_to_milliseconds(self.timeout)
323
def extended_timeout_milliseconds(self):
324
"Return the 'extended_timeout' attribute in milliseconds"
325
return _timedelta_to_milliseconds(self.extended_timeout)
277
return self._timedelta_to_milliseconds(self.timeout)
327
279
def interval_milliseconds(self):
328
280
"Return the 'interval' attribute in milliseconds"
329
return _timedelta_to_milliseconds(self.interval)
331
def approval_delay_milliseconds(self):
332
return _timedelta_to_milliseconds(self.approval_delay)
281
return self._timedelta_to_milliseconds(self.interval)
283
def approved_delay_milliseconds(self):
284
return self._timedelta_to_milliseconds(self.approved_delay)
334
286
def __init__(self, name = None, disable_hook=None, config=None):
335
287
"""Note: the 'checker' key in 'config' sets the
339
291
if config is None:
341
logger.debug("Creating client %r", self.name)
293
logger.debug(u"Creating client %r", self.name)
342
294
# Uppercase and remove spaces from fingerprint for later
343
295
# comparison purposes with return value from the fingerprint()
345
self.fingerprint = (config["fingerprint"].upper()
347
logger.debug(" Fingerprint: %s", self.fingerprint)
348
if "secret" in config:
349
self.secret = config["secret"].decode("base64")
350
elif "secfile" in config:
297
self.fingerprint = (config[u"fingerprint"].upper()
299
logger.debug(u" Fingerprint: %s", self.fingerprint)
300
if u"secret" in config:
301
self.secret = config[u"secret"].decode(u"base64")
302
elif u"secfile" in config:
351
303
with open(os.path.expanduser(os.path.expandvars
352
(config["secfile"])),
304
(config[u"secfile"])),
353
305
"rb") as secfile:
354
306
self.secret = secfile.read()
356
raise TypeError("No secret or secfile for client %s"
308
raise TypeError(u"No secret or secfile for client %s"
358
self.host = config.get("host", "")
310
self.host = config.get(u"host", u"")
359
311
self.created = datetime.datetime.utcnow()
360
312
self.enabled = False
361
self.last_approval_request = None
362
313
self.last_enabled = None
363
314
self.last_checked_ok = None
364
self.timeout = string_to_delta(config["timeout"])
365
self.extended_timeout = string_to_delta(config
366
["extended_timeout"])
367
self.interval = string_to_delta(config["interval"])
315
self.timeout = string_to_delta(config[u"timeout"])
316
self.interval = string_to_delta(config[u"interval"])
368
317
self.disable_hook = disable_hook
369
318
self.checker = None
370
319
self.checker_initiator_tag = None
371
320
self.disable_initiator_tag = None
373
321
self.checker_callback_tag = None
374
self.checker_command = config["checker"]
322
self.checker_command = config[u"checker"]
375
323
self.current_checker_command = None
376
324
self.last_connect = None
377
325
self._approved = None
378
self.approved_by_default = config.get("approved_by_default",
326
self.approved_by_default = config.get(u"approved_by_default",
380
328
self.approvals_pending = 0
381
self.approval_delay = string_to_delta(
382
config["approval_delay"])
383
self.approval_duration = string_to_delta(
384
config["approval_duration"])
385
self.changedstate = (multiprocessing_manager
386
.Condition(multiprocessing_manager
329
self.approved_delay = string_to_delta(
330
config[u"approved_delay"])
331
self.approved_duration = string_to_delta(
332
config[u"approved_duration"])
333
self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
389
335
def send_changedstate(self):
390
336
self.changedstate.acquire()
391
337
self.changedstate.notify_all()
392
338
self.changedstate.release()
394
340
def enable(self):
395
341
"""Start this client's checker and timeout hooks"""
396
if getattr(self, "enabled", False):
342
if getattr(self, u"enabled", False):
397
343
# Already enabled
399
345
self.send_changedstate()
346
self.last_enabled = datetime.datetime.utcnow()
400
347
# Schedule a new checker to be started an 'interval' from now,
401
348
# and every interval from then on.
402
349
self.checker_initiator_tag = (gobject.timeout_add
403
350
(self.interval_milliseconds(),
404
351
self.start_checker))
405
352
# Schedule a disable() when 'timeout' has passed
406
self.expires = datetime.datetime.utcnow() + self.timeout
407
353
self.disable_initiator_tag = (gobject.timeout_add
408
354
(self.timeout_milliseconds(),
410
356
self.enabled = True
411
self.last_enabled = datetime.datetime.utcnow()
412
357
# Also start a new checker *right now*.
413
358
self.start_checker()
445
389
if os.WIFEXITED(condition):
446
390
exitstatus = os.WEXITSTATUS(condition)
447
391
if exitstatus == 0:
448
logger.info("Checker for %(name)s succeeded",
392
logger.info(u"Checker for %(name)s succeeded",
450
394
self.checked_ok()
452
logger.info("Checker for %(name)s failed",
396
logger.info(u"Checker for %(name)s failed",
455
logger.warning("Checker for %(name)s crashed?",
399
logger.warning(u"Checker for %(name)s crashed?",
458
def checked_ok(self, timeout=None):
402
def checked_ok(self):
459
403
"""Bump up the timeout for this client.
461
405
This should only be called when the client has been seen,
465
timeout = self.timeout
466
408
self.last_checked_ok = datetime.datetime.utcnow()
467
if self.disable_initiator_tag is not None:
468
gobject.source_remove(self.disable_initiator_tag)
469
if getattr(self, "enabled", False):
470
self.disable_initiator_tag = (gobject.timeout_add
471
(_timedelta_to_milliseconds
472
(timeout), self.disable))
473
self.expires = datetime.datetime.utcnow() + timeout
475
def need_approval(self):
476
self.last_approval_request = datetime.datetime.utcnow()
409
gobject.source_remove(self.disable_initiator_tag)
410
self.disable_initiator_tag = (gobject.timeout_add
411
(self.timeout_milliseconds(),
478
414
def start_checker(self):
479
415
"""Start a new checker subprocess if one is not running.
630
563
def _is_dbus_property(obj):
631
return getattr(obj, "_dbus_is_property", False)
564
return getattr(obj, u"_dbus_is_property", False)
633
566
def _get_all_dbus_properties(self):
634
567
"""Returns a generator of (name, attribute) pairs
636
return ((prop.__get__(self)._dbus_name, prop.__get__(self))
637
for cls in self.__class__.__mro__
569
return ((prop._dbus_name, prop)
638
570
for name, prop in
639
inspect.getmembers(cls, self._is_dbus_property))
571
inspect.getmembers(self, self._is_dbus_property))
641
573
def _get_dbus_property(self, interface_name, property_name):
642
574
"""Returns a bound method if one exists which is a D-Bus
643
575
property with the specified name and interface.
645
for cls in self.__class__.__mro__:
646
for name, value in (inspect.getmembers
647
(cls, self._is_dbus_property)):
648
if (value._dbus_name == property_name
649
and value._dbus_interface == interface_name):
650
return value.__get__(self)
577
for name in (property_name,
578
property_name + u"_dbus_property"):
579
prop = getattr(self, name, None)
581
or not self._is_dbus_property(prop)
582
or prop._dbus_name != property_name
583
or (interface_name and prop._dbus_interface
584
and interface_name != prop._dbus_interface)):
652
587
# No such property
653
raise DBusPropertyNotFound(self.dbus_object_path + ":"
654
+ interface_name + "."
588
raise DBusPropertyNotFound(self.dbus_object_path + u":"
589
+ interface_name + u"."
657
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
592
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ss",
659
594
def Get(self, interface_name, property_name):
660
595
"""Standard D-Bus property Get() method, see D-Bus standard.
662
597
prop = self._get_dbus_property(interface_name, property_name)
663
if prop._dbus_access == "write":
598
if prop._dbus_access == u"write":
664
599
raise DBusPropertyAccessException(property_name)
666
if not hasattr(value, "variant_level"):
601
if not hasattr(value, u"variant_level"):
668
603
return type(value)(value, variant_level=value.variant_level+1)
670
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
605
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ssv")
671
606
def Set(self, interface_name, property_name, value):
672
607
"""Standard D-Bus property Set() method, see D-Bus standard.
674
609
prop = self._get_dbus_property(interface_name, property_name)
675
if prop._dbus_access == "read":
610
if prop._dbus_access == u"read":
676
611
raise DBusPropertyAccessException(property_name)
677
if prop._dbus_get_args_options["byte_arrays"]:
612
if prop._dbus_get_args_options[u"byte_arrays"]:
678
613
# The byte_arrays option is not supported yet on
679
614
# signatures other than "ay".
680
if prop._dbus_signature != "ay":
615
if prop._dbus_signature != u"ay":
682
617
value = dbus.ByteArray(''.join(unichr(byte)
683
618
for byte in value))
686
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
687
out_signature="a{sv}")
621
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"s",
622
out_signature=u"a{sv}")
688
623
def GetAll(self, interface_name):
689
624
"""Standard D-Bus property GetAll() method, see D-Bus
692
627
Note: Will not include properties with access="write".
721
656
document = xml.dom.minidom.parseString(xmlstring)
722
657
def make_tag(document, name, prop):
723
e = document.createElement("property")
724
e.setAttribute("name", name)
725
e.setAttribute("type", prop._dbus_signature)
726
e.setAttribute("access", prop._dbus_access)
658
e = document.createElement(u"property")
659
e.setAttribute(u"name", name)
660
e.setAttribute(u"type", prop._dbus_signature)
661
e.setAttribute(u"access", prop._dbus_access)
728
for if_tag in document.getElementsByTagName("interface"):
663
for if_tag in document.getElementsByTagName(u"interface"):
729
664
for tag in (make_tag(document, name, prop)
731
666
in self._get_all_dbus_properties()
732
667
if prop._dbus_interface
733
== if_tag.getAttribute("name")):
668
== if_tag.getAttribute(u"name")):
734
669
if_tag.appendChild(tag)
735
670
# Add the names to the return values for the
736
671
# "org.freedesktop.DBus.Properties" methods
737
if (if_tag.getAttribute("name")
738
== "org.freedesktop.DBus.Properties"):
739
for cn in if_tag.getElementsByTagName("method"):
740
if cn.getAttribute("name") == "Get":
741
for arg in cn.getElementsByTagName("arg"):
742
if (arg.getAttribute("direction")
744
arg.setAttribute("name", "value")
745
elif cn.getAttribute("name") == "GetAll":
746
for arg in cn.getElementsByTagName("arg"):
747
if (arg.getAttribute("direction")
749
arg.setAttribute("name", "props")
750
xmlstring = document.toxml("utf-8")
672
if (if_tag.getAttribute(u"name")
673
== u"org.freedesktop.DBus.Properties"):
674
for cn in if_tag.getElementsByTagName(u"method"):
675
if cn.getAttribute(u"name") == u"Get":
676
for arg in cn.getElementsByTagName(u"arg"):
677
if (arg.getAttribute(u"direction")
679
arg.setAttribute(u"name", u"value")
680
elif cn.getAttribute(u"name") == u"GetAll":
681
for arg in cn.getElementsByTagName(u"arg"):
682
if (arg.getAttribute(u"direction")
684
arg.setAttribute(u"name", u"props")
685
xmlstring = document.toxml(u"utf-8")
751
686
document.unlink()
752
687
except (AttributeError, xml.dom.DOMException,
753
xml.parsers.expat.ExpatError) as error:
754
logger.error("Failed to override Introspection method",
688
xml.parsers.expat.ExpatError), error:
689
logger.error(u"Failed to override Introspection method",
759
def datetime_to_dbus (dt, variant_level=0):
760
"""Convert a UTC datetime.datetime() to a D-Bus type."""
762
return dbus.String("", variant_level = variant_level)
763
return dbus.String(dt.isoformat(),
764
variant_level=variant_level)
766
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
768
"""Applied to an empty subclass of a D-Bus object, this metaclass
769
will add additional D-Bus attributes matching a certain pattern.
771
def __new__(mcs, name, bases, attr):
772
# Go through all the base classes which could have D-Bus
773
# methods, signals, or properties in them
774
for base in (b for b in bases
775
if issubclass(b, dbus.service.Object)):
776
# Go though all attributes of the base class
777
for attrname, attribute in inspect.getmembers(base):
778
# Ignore non-D-Bus attributes, and D-Bus attributes
779
# with the wrong interface name
780
if (not hasattr(attribute, "_dbus_interface")
781
or not attribute._dbus_interface
782
.startswith("se.recompile.Mandos")):
784
# Create an alternate D-Bus interface name based on
786
alt_interface = (attribute._dbus_interface
787
.replace("se.recompile.Mandos",
788
"se.bsnet.fukt.Mandos"))
789
# Is this a D-Bus signal?
790
if getattr(attribute, "_dbus_is_signal", False):
791
# Extract the original non-method function by
793
nonmethod_func = (dict(
794
zip(attribute.func_code.co_freevars,
795
attribute.__closure__))["func"]
797
# Create a new, but exactly alike, function
798
# object, and decorate it to be a new D-Bus signal
799
# with the alternate D-Bus interface name
800
new_function = (dbus.service.signal
802
attribute._dbus_signature)
804
nonmethod_func.func_code,
805
nonmethod_func.func_globals,
806
nonmethod_func.func_name,
807
nonmethod_func.func_defaults,
808
nonmethod_func.func_closure)))
809
# Define a creator of a function to call both the
810
# old and new functions, so both the old and new
811
# signals gets sent when the function is called
812
def fixscope(func1, func2):
813
"""This function is a scope container to pass
814
func1 and func2 to the "call_both" function
815
outside of its arguments"""
816
def call_both(*args, **kwargs):
817
"""This function will emit two D-Bus
818
signals by calling func1 and func2"""
819
func1(*args, **kwargs)
820
func2(*args, **kwargs)
822
# Create the "call_both" function and add it to
824
attr[attrname] = fixscope(attribute,
826
# Is this a D-Bus method?
827
elif getattr(attribute, "_dbus_is_method", False):
828
# Create a new, but exactly alike, function
829
# object. Decorate it to be a new D-Bus method
830
# with the alternate D-Bus interface name. Add it
832
attr[attrname] = (dbus.service.method
834
attribute._dbus_in_signature,
835
attribute._dbus_out_signature)
837
(attribute.func_code,
838
attribute.func_globals,
840
attribute.func_defaults,
841
attribute.func_closure)))
842
# Is this a D-Bus property?
843
elif getattr(attribute, "_dbus_is_property", False):
844
# Create a new, but exactly alike, function
845
# object, and decorate it to be a new D-Bus
846
# property with the alternate D-Bus interface
847
# name. Add it to the class.
848
attr[attrname] = (dbus_service_property
850
attribute._dbus_signature,
851
attribute._dbus_access,
853
._dbus_get_args_options
856
(attribute.func_code,
857
attribute.func_globals,
859
attribute.func_defaults,
860
attribute.func_closure)))
861
return type.__new__(mcs, name, bases, attr)
863
694
class ClientDBus(Client, DBusObjectWithProperties):
864
695
"""A Client class using D-Bus
879
706
Client.__init__(self, *args, **kwargs)
880
707
# Only now, when this client is initialized, can it show up on
882
client_object_name = unicode(self.name).translate(
885
709
self.dbus_object_path = (dbus.ObjectPath
886
("/clients/" + client_object_name))
711
+ self.name.replace(u".", u"_")))
887
712
DBusObjectWithProperties.__init__(self, self.bus,
888
713
self.dbus_object_path)
890
def notifychangeproperty(transform_func,
891
dbus_name, type_func=lambda x: x,
893
""" Modify a variable so that it's a property which announces
896
transform_fun: Function that takes a value and a variant_level
897
and transforms it to a D-Bus type.
898
dbus_name: D-Bus name of the variable
899
type_func: Function that transform the value before sending it
900
to the D-Bus. Default: no transform
901
variant_level: D-Bus variant level. Default: 1
903
attrname = "_{0}".format(dbus_name)
904
def setter(self, value):
905
if hasattr(self, "dbus_object_path"):
906
if (not hasattr(self, attrname) or
907
type_func(getattr(self, attrname, None))
908
!= type_func(value)):
909
dbus_value = transform_func(type_func(value),
912
self.PropertyChanged(dbus.String(dbus_name),
914
setattr(self, attrname, value)
916
return property(lambda self: getattr(self, attrname), setter)
919
expires = notifychangeproperty(datetime_to_dbus, "Expires")
920
approvals_pending = notifychangeproperty(dbus.Boolean,
923
enabled = notifychangeproperty(dbus.Boolean, "Enabled")
924
last_enabled = notifychangeproperty(datetime_to_dbus,
926
checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
927
type_func = lambda checker:
929
last_checked_ok = notifychangeproperty(datetime_to_dbus,
931
last_approval_request = notifychangeproperty(
932
datetime_to_dbus, "LastApprovalRequest")
933
approved_by_default = notifychangeproperty(dbus.Boolean,
935
approval_delay = notifychangeproperty(dbus.UInt16,
938
_timedelta_to_milliseconds)
939
approval_duration = notifychangeproperty(
940
dbus.UInt16, "ApprovalDuration",
941
type_func = _timedelta_to_milliseconds)
942
host = notifychangeproperty(dbus.String, "Host")
943
timeout = notifychangeproperty(dbus.UInt16, "Timeout",
945
_timedelta_to_milliseconds)
946
extended_timeout = notifychangeproperty(
947
dbus.UInt16, "ExtendedTimeout",
948
type_func = _timedelta_to_milliseconds)
949
interval = notifychangeproperty(dbus.UInt16,
952
_timedelta_to_milliseconds)
953
checker_command = notifychangeproperty(dbus.String, "Checker")
955
del notifychangeproperty
715
def _get_approvals_pending(self):
716
return self._approvals_pending
717
def _set_approvals_pending(self, value):
718
old_value = self._approvals_pending
719
self._approvals_pending = value
721
if (hasattr(self, "dbus_object_path")
722
and bval is not bool(old_value)):
723
dbus_bool = dbus.Boolean(bval, variant_level=1)
724
self.PropertyChanged(dbus.String(u"approved_pending"),
727
approvals_pending = property(_get_approvals_pending,
728
_set_approvals_pending)
729
del _get_approvals_pending, _set_approvals_pending
732
def _datetime_to_dbus(dt, variant_level=0):
733
"""Convert a UTC datetime.datetime() to a D-Bus type."""
734
return dbus.String(dt.isoformat(),
735
variant_level=variant_level)
738
oldstate = getattr(self, u"enabled", False)
739
r = Client.enable(self)
740
if oldstate != self.enabled:
742
self.PropertyChanged(dbus.String(u"enabled"),
743
dbus.Boolean(True, variant_level=1))
744
self.PropertyChanged(
745
dbus.String(u"last_enabled"),
746
self._datetime_to_dbus(self.last_enabled,
750
def disable(self, quiet = False):
751
oldstate = getattr(self, u"enabled", False)
752
r = Client.disable(self, quiet=quiet)
753
if not quiet and oldstate != self.enabled:
755
self.PropertyChanged(dbus.String(u"enabled"),
756
dbus.Boolean(False, variant_level=1))
957
759
def __del__(self, *args, **kwargs):
959
761
self.remove_from_connection()
960
762
except LookupError:
962
if hasattr(DBusObjectWithProperties, "__del__"):
764
if hasattr(DBusObjectWithProperties, u"__del__"):
963
765
DBusObjectWithProperties.__del__(self, *args, **kwargs)
964
766
Client.__del__(self, *args, **kwargs)
1092
# ApprovalPending - property
1093
@dbus_service_property(_interface, signature="b", access="read")
1094
def ApprovalPending_dbus_property(self):
917
# approved_pending - property
918
@dbus_service_property(_interface, signature=u"b", access=u"read")
919
def approved_pending_dbus_property(self):
1095
920
return dbus.Boolean(bool(self.approvals_pending))
1097
# ApprovedByDefault - property
1098
@dbus_service_property(_interface, signature="b",
1100
def ApprovedByDefault_dbus_property(self, value=None):
1101
if value is None: # get
1102
return dbus.Boolean(self.approved_by_default)
1103
self.approved_by_default = bool(value)
1105
# ApprovalDelay - property
1106
@dbus_service_property(_interface, signature="t",
1108
def ApprovalDelay_dbus_property(self, value=None):
1109
if value is None: # get
1110
return dbus.UInt64(self.approval_delay_milliseconds())
1111
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1113
# ApprovalDuration - property
1114
@dbus_service_property(_interface, signature="t",
1116
def ApprovalDuration_dbus_property(self, value=None):
1117
if value is None: # get
1118
return dbus.UInt64(_timedelta_to_milliseconds(
1119
self.approval_duration))
1120
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1123
@dbus_service_property(_interface, signature="s", access="read")
1124
def Name_dbus_property(self):
922
# approved_by_default - property
923
@dbus_service_property(_interface, signature=u"b",
925
def approved_by_default_dbus_property(self):
926
return dbus.Boolean(self.approved_by_default)
928
# approved_delay - property
929
@dbus_service_property(_interface, signature=u"t",
931
def approved_delay_dbus_property(self):
932
return dbus.UInt64(self.approved_delay_milliseconds())
934
# approved_duration - property
935
@dbus_service_property(_interface, signature=u"t",
937
def approved_duration_dbus_property(self):
938
return dbus.UInt64(self._timedelta_to_milliseconds(
939
self.approved_duration))
942
@dbus_service_property(_interface, signature=u"s", access=u"read")
943
def name_dbus_property(self):
1125
944
return dbus.String(self.name)
1127
# Fingerprint - property
1128
@dbus_service_property(_interface, signature="s", access="read")
1129
def Fingerprint_dbus_property(self):
946
# fingerprint - property
947
@dbus_service_property(_interface, signature=u"s", access=u"read")
948
def fingerprint_dbus_property(self):
1130
949
return dbus.String(self.fingerprint)
1133
@dbus_service_property(_interface, signature="s",
1135
def Host_dbus_property(self, value=None):
952
@dbus_service_property(_interface, signature=u"s",
954
def host_dbus_property(self, value=None):
1136
955
if value is None: # get
1137
956
return dbus.String(self.host)
1138
957
self.host = value
1140
# Created - property
1141
@dbus_service_property(_interface, signature="s", access="read")
1142
def Created_dbus_property(self):
1143
return dbus.String(datetime_to_dbus(self.created))
1145
# LastEnabled - property
1146
@dbus_service_property(_interface, signature="s", access="read")
1147
def LastEnabled_dbus_property(self):
1148
return datetime_to_dbus(self.last_enabled)
1150
# Enabled - property
1151
@dbus_service_property(_interface, signature="b",
1153
def Enabled_dbus_property(self, value=None):
959
self.PropertyChanged(dbus.String(u"host"),
960
dbus.String(value, variant_level=1))
963
@dbus_service_property(_interface, signature=u"s", access=u"read")
964
def created_dbus_property(self):
965
return dbus.String(self._datetime_to_dbus(self.created))
967
# last_enabled - property
968
@dbus_service_property(_interface, signature=u"s", access=u"read")
969
def last_enabled_dbus_property(self):
970
if self.last_enabled is None:
971
return dbus.String(u"")
972
return dbus.String(self._datetime_to_dbus(self.last_enabled))
975
@dbus_service_property(_interface, signature=u"b",
977
def enabled_dbus_property(self, value=None):
1154
978
if value is None: # get
1155
979
return dbus.Boolean(self.enabled)
1161
# LastCheckedOK - property
1162
@dbus_service_property(_interface, signature="s",
1164
def LastCheckedOK_dbus_property(self, value=None):
985
# last_checked_ok - property
986
@dbus_service_property(_interface, signature=u"s",
988
def last_checked_ok_dbus_property(self, value=None):
1165
989
if value is not None:
1166
990
self.checked_ok()
1168
return datetime_to_dbus(self.last_checked_ok)
1170
# Expires - property
1171
@dbus_service_property(_interface, signature="s", access="read")
1172
def Expires_dbus_property(self):
1173
return datetime_to_dbus(self.expires)
1175
# LastApprovalRequest - property
1176
@dbus_service_property(_interface, signature="s", access="read")
1177
def LastApprovalRequest_dbus_property(self):
1178
return datetime_to_dbus(self.last_approval_request)
1180
# Timeout - property
1181
@dbus_service_property(_interface, signature="t",
1183
def Timeout_dbus_property(self, value=None):
992
if self.last_checked_ok is None:
993
return dbus.String(u"")
994
return dbus.String(self._datetime_to_dbus(self
998
@dbus_service_property(_interface, signature=u"t",
1000
def timeout_dbus_property(self, value=None):
1184
1001
if value is None: # get
1185
1002
return dbus.UInt64(self.timeout_milliseconds())
1186
1003
self.timeout = datetime.timedelta(0, 0, 0, value)
1187
if getattr(self, "disable_initiator_tag", None) is None:
1005
self.PropertyChanged(dbus.String(u"timeout"),
1006
dbus.UInt64(value, variant_level=1))
1007
if getattr(self, u"disable_initiator_tag", None) is None:
1189
1009
# Reschedule timeout
1190
1010
gobject.source_remove(self.disable_initiator_tag)
1191
1011
self.disable_initiator_tag = None
1193
time_to_die = _timedelta_to_milliseconds((self
1012
time_to_die = (self.
1013
_timedelta_to_milliseconds((self
1198
1018
if time_to_die <= 0:
1199
1019
# The timeout has passed
1202
self.expires = (datetime.datetime.utcnow()
1203
+ datetime.timedelta(milliseconds =
1205
1022
self.disable_initiator_tag = (gobject.timeout_add
1206
1023
(time_to_die, self.disable))
1208
# ExtendedTimeout - property
1209
@dbus_service_property(_interface, signature="t",
1211
def ExtendedTimeout_dbus_property(self, value=None):
1212
if value is None: # get
1213
return dbus.UInt64(self.extended_timeout_milliseconds())
1214
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1216
# Interval - property
1217
@dbus_service_property(_interface, signature="t",
1219
def Interval_dbus_property(self, value=None):
1025
# interval - property
1026
@dbus_service_property(_interface, signature=u"t",
1027
access=u"readwrite")
1028
def interval_dbus_property(self, value=None):
1220
1029
if value is None: # get
1221
1030
return dbus.UInt64(self.interval_milliseconds())
1222
1031
self.interval = datetime.timedelta(0, 0, 0, value)
1223
if getattr(self, "checker_initiator_tag", None) is None:
1033
self.PropertyChanged(dbus.String(u"interval"),
1034
dbus.UInt64(value, variant_level=1))
1035
if getattr(self, u"checker_initiator_tag", None) is None:
1225
1037
# Reschedule checker run
1226
1038
gobject.source_remove(self.checker_initiator_tag)
1227
1039
self.checker_initiator_tag = (gobject.timeout_add
1228
1040
(value, self.start_checker))
1229
1041
self.start_checker() # Start one now, too
1231
# Checker - property
1232
@dbus_service_property(_interface, signature="s",
1234
def Checker_dbus_property(self, value=None):
1043
# checker - property
1044
@dbus_service_property(_interface, signature=u"s",
1045
access=u"readwrite")
1046
def checker_dbus_property(self, value=None):
1235
1047
if value is None: # get
1236
1048
return dbus.String(self.checker_command)
1237
1049
self.checker_command = value
1051
self.PropertyChanged(dbus.String(u"checker"),
1052
dbus.String(self.checker_command,
1239
# CheckerRunning - property
1240
@dbus_service_property(_interface, signature="b",
1242
def CheckerRunning_dbus_property(self, value=None):
1055
# checker_running - property
1056
@dbus_service_property(_interface, signature=u"b",
1057
access=u"readwrite")
1058
def checker_running_dbus_property(self, value=None):
1243
1059
if value is None: # get
1244
1060
return dbus.Boolean(self.checker is not None)
1298
1112
def handle(self):
1299
1113
with contextlib.closing(self.server.child_pipe) as child_pipe:
1300
logger.info("TCP connection from: %s",
1114
logger.info(u"TCP connection from: %s",
1301
1115
unicode(self.client_address))
1302
logger.debug("Pipe FD: %d",
1116
logger.debug(u"Pipe FD: %d",
1303
1117
self.server.child_pipe.fileno())
1305
1119
session = (gnutls.connection
1306
1120
.ClientSession(self.request,
1307
1121
gnutls.connection
1308
1122
.X509Credentials()))
1310
1124
# Note: gnutls.connection.X509Credentials is really a
1311
1125
# generic GnuTLS certificate credentials object so long as
1312
1126
# no X.509 keys are added to it. Therefore, we can use it
1313
1127
# here despite using OpenPGP certificates.
1315
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1316
# "+AES-256-CBC", "+SHA1",
1317
# "+COMP-NULL", "+CTYPE-OPENPGP",
1129
#priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
1130
# u"+AES-256-CBC", u"+SHA1",
1131
# u"+COMP-NULL", u"+CTYPE-OPENPGP",
1319
1133
# Use a fallback default, since this MUST be set.
1320
1134
priority = self.server.gnutls_priority
1321
1135
if priority is None:
1136
priority = u"NORMAL"
1323
1137
(gnutls.library.functions
1324
1138
.gnutls_priority_set_direct(session._c_object,
1325
1139
priority, None))
1327
1141
# Start communication using the Mandos protocol
1328
1142
# Get protocol number
1329
1143
line = self.request.makefile().readline()
1330
logger.debug("Protocol version: %r", line)
1144
logger.debug(u"Protocol version: %r", line)
1332
1146
if int(line.strip().split()[0]) > 1:
1333
1147
raise RuntimeError
1334
except (ValueError, IndexError, RuntimeError) as error:
1335
logger.error("Unknown protocol version: %s", error)
1148
except (ValueError, IndexError, RuntimeError), error:
1149
logger.error(u"Unknown protocol version: %s", error)
1338
1152
# Start GnuTLS connection
1340
1154
session.handshake()
1341
except gnutls.errors.GNUTLSError as error:
1342
logger.warning("Handshake failed: %s", error)
1155
except gnutls.errors.GNUTLSError, error:
1156
logger.warning(u"Handshake failed: %s", error)
1343
1157
# Do not run session.bye() here: the session is not
1344
1158
# established. Just abandon the request.
1346
logger.debug("Handshake succeeded")
1160
logger.debug(u"Handshake succeeded")
1348
1162
approval_required = False
1351
1165
fpr = self.fingerprint(self.peer_certificate
1354
gnutls.errors.GNUTLSError) as error:
1355
logger.warning("Bad certificate: %s", error)
1167
except (TypeError, gnutls.errors.GNUTLSError), error:
1168
logger.warning(u"Bad certificate: %s", error)
1357
logger.debug("Fingerprint: %s", fpr)
1170
logger.debug(u"Fingerprint: %s", fpr)
1360
1173
client = ProxyClient(child_pipe, fpr,
1361
1174
self.client_address)
1362
1175
except KeyError:
1365
if client.approval_delay:
1366
delay = client.approval_delay
1178
if client.approved_delay:
1179
delay = client.approved_delay
1367
1180
client.approvals_pending += 1
1368
1181
approval_required = True
1371
1184
if not client.enabled:
1372
logger.info("Client %s is disabled",
1185
logger.warning(u"Client %s is disabled",
1374
1187
if self.server.use_dbus:
1375
1188
# Emit D-Bus signal
1376
client.Rejected("Disabled")
1189
client.Rejected("Disabled")
1379
if client._approved or not client.approval_delay:
1192
if client._approved or not client.approved_delay:
1380
1193
#We are approved or approval is disabled
1382
1195
elif client._approved is None:
1383
logger.info("Client %s needs approval",
1196
logger.info(u"Client %s need approval",
1385
1198
if self.server.use_dbus:
1386
1199
# Emit D-Bus signal
1387
1200
client.NeedApproval(
1388
client.approval_delay_milliseconds(),
1201
client.approved_delay_milliseconds(),
1389
1202
client.approved_by_default)
1391
logger.warning("Client %s was not approved",
1204
logger.warning(u"Client %s was not approved",
1393
1206
if self.server.use_dbus:
1394
1207
# Emit D-Bus signal
1395
client.Rejected("Denied")
1208
client.Rejected("Disapproved")
1398
1211
#wait until timeout or approved
1212
#x = float(client._timedelta_to_milliseconds(delay))
1399
1213
time = datetime.datetime.now()
1400
1214
client.changedstate.acquire()
1401
(client.changedstate.wait
1402
(float(client._timedelta_to_milliseconds(delay)
1215
client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
1404
1216
client.changedstate.release()
1405
1217
time2 = datetime.datetime.now()
1406
1218
if (time2 - time) >= delay:
1634
1441
def server_activate(self):
1635
1442
if self.enabled:
1636
1443
return socketserver.TCPServer.server_activate(self)
1638
1444
def enable(self):
1639
1445
self.enabled = True
1641
def add_pipe(self, parent_pipe, proc):
1446
def add_pipe(self, parent_pipe):
1642
1447
# Call "handle_ipc" for both data and EOF events
1643
1448
gobject.io_add_watch(parent_pipe.fileno(),
1644
1449
gobject.IO_IN | gobject.IO_HUP,
1645
1450
functools.partial(self.handle_ipc,
1451
parent_pipe = parent_pipe))
1650
1453
def handle_ipc(self, source, condition, parent_pipe=None,
1651
proc = None, client_object=None):
1454
client_object=None):
1652
1455
condition_names = {
1653
gobject.IO_IN: "IN", # There is data to read.
1654
gobject.IO_OUT: "OUT", # Data can be written (without
1456
gobject.IO_IN: u"IN", # There is data to read.
1457
gobject.IO_OUT: u"OUT", # Data can be written (without
1656
gobject.IO_PRI: "PRI", # There is urgent data to read.
1657
gobject.IO_ERR: "ERR", # Error condition.
1658
gobject.IO_HUP: "HUP" # Hung up (the connection has been
1459
gobject.IO_PRI: u"PRI", # There is urgent data to read.
1460
gobject.IO_ERR: u"ERR", # Error condition.
1461
gobject.IO_HUP: u"HUP" # Hung up (the connection has been
1659
1462
# broken, usually for pipes and
1685
logger.info("Client not found for fingerprint: %s, ad"
1686
"dress: %s", fpr, address)
1490
logger.warning(u"Client not found for fingerprint: %s, ad"
1491
u"dress: %s", fpr, address)
1687
1492
if self.use_dbus:
1688
1493
# Emit D-Bus signal
1689
mandos_dbus_service.ClientNotFound(fpr,
1494
mandos_dbus_service.ClientNotFound(fpr, address)
1691
1495
parent_pipe.send(False)
1694
1498
gobject.io_add_watch(parent_pipe.fileno(),
1695
1499
gobject.IO_IN | gobject.IO_HUP,
1696
1500
functools.partial(self.handle_ipc,
1501
parent_pipe = parent_pipe,
1502
client_object = client))
1702
1503
parent_pipe.send(True)
1703
# remove the old hook in favor of the new above hook on
1504
# remove the old hook in favor of the new above hook on same fileno
1706
1506
if command == 'funcall':
1707
1507
funcname = request[1]
1708
1508
args = request[2]
1709
1509
kwargs = request[3]
1711
parent_pipe.send(('data', getattr(client_object,
1511
parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
1715
1513
if command == 'getattr':
1716
1514
attrname = request[1]
1717
1515
if callable(client_object.__getattribute__(attrname)):
1718
1516
parent_pipe.send(('function',))
1720
parent_pipe.send(('data', client_object
1721
.__getattribute__(attrname)))
1518
parent_pipe.send(('data', client_object.__getattribute__(attrname)))
1723
1520
if command == 'setattr':
1724
1521
attrname = request[1]
1725
1522
value = request[2]
1726
1523
setattr(client_object, attrname, value)
1731
1528
def string_to_delta(interval):
1732
1529
"""Parse a string and return a datetime.timedelta
1734
>>> string_to_delta('7d')
1531
>>> string_to_delta(u'7d')
1735
1532
datetime.timedelta(7)
1736
>>> string_to_delta('60s')
1533
>>> string_to_delta(u'60s')
1737
1534
datetime.timedelta(0, 60)
1738
>>> string_to_delta('60m')
1535
>>> string_to_delta(u'60m')
1739
1536
datetime.timedelta(0, 3600)
1740
>>> string_to_delta('24h')
1537
>>> string_to_delta(u'24h')
1741
1538
datetime.timedelta(1)
1742
>>> string_to_delta('1w')
1539
>>> string_to_delta(u'1w')
1743
1540
datetime.timedelta(7)
1744
>>> string_to_delta('5m 30s')
1541
>>> string_to_delta(u'5m 30s')
1745
1542
datetime.timedelta(0, 330)
1747
1544
timevalue = datetime.timedelta(0)
1821
1618
##################################################################
1822
1619
# Parsing of options, both command line and config file
1824
parser = argparse.ArgumentParser()
1825
parser.add_argument("-v", "--version", action="version",
1826
version = "%%(prog)s %s" % version,
1827
help="show version number and exit")
1828
parser.add_argument("-i", "--interface", metavar="IF",
1829
help="Bind to interface IF")
1830
parser.add_argument("-a", "--address",
1831
help="Address to listen for requests on")
1832
parser.add_argument("-p", "--port", type=int,
1833
help="Port number to receive requests on")
1834
parser.add_argument("--check", action="store_true",
1835
help="Run self-test")
1836
parser.add_argument("--debug", action="store_true",
1837
help="Debug mode; run in foreground and log"
1839
parser.add_argument("--debuglevel", metavar="LEVEL",
1840
help="Debug level for stdout output")
1841
parser.add_argument("--priority", help="GnuTLS"
1842
" priority string (see GnuTLS documentation)")
1843
parser.add_argument("--servicename",
1844
metavar="NAME", help="Zeroconf service name")
1845
parser.add_argument("--configdir",
1846
default="/etc/mandos", metavar="DIR",
1847
help="Directory to search for configuration"
1849
parser.add_argument("--no-dbus", action="store_false",
1850
dest="use_dbus", help="Do not provide D-Bus"
1851
" system bus interface")
1852
parser.add_argument("--no-ipv6", action="store_false",
1853
dest="use_ipv6", help="Do not use IPv6")
1854
options = parser.parse_args()
1621
parser = optparse.OptionParser(version = "%%prog %s" % version)
1622
parser.add_option("-i", u"--interface", type=u"string",
1623
metavar="IF", help=u"Bind to interface IF")
1624
parser.add_option("-a", u"--address", type=u"string",
1625
help=u"Address to listen for requests on")
1626
parser.add_option("-p", u"--port", type=u"int",
1627
help=u"Port number to receive requests on")
1628
parser.add_option("--check", action=u"store_true",
1629
help=u"Run self-test")
1630
parser.add_option("--debug", action=u"store_true",
1631
help=u"Debug mode; run in foreground and log to"
1633
parser.add_option("--debuglevel", type=u"string", metavar="Level",
1634
help=u"Debug level for stdout output")
1635
parser.add_option("--priority", type=u"string", help=u"GnuTLS"
1636
u" priority string (see GnuTLS documentation)")
1637
parser.add_option("--servicename", type=u"string",
1638
metavar=u"NAME", help=u"Zeroconf service name")
1639
parser.add_option("--configdir", type=u"string",
1640
default=u"/etc/mandos", metavar=u"DIR",
1641
help=u"Directory to search for configuration"
1643
parser.add_option("--no-dbus", action=u"store_false",
1644
dest=u"use_dbus", help=u"Do not provide D-Bus"
1645
u" system bus interface")
1646
parser.add_option("--no-ipv6", action=u"store_false",
1647
dest=u"use_ipv6", help=u"Do not use IPv6")
1648
options = parser.parse_args()[0]
1856
1650
if options.check:
1861
1655
# Default values for config file for server-global settings
1862
server_defaults = { "interface": "",
1867
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1868
"servicename": "Mandos",
1656
server_defaults = { u"interface": u"",
1661
u"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1662
u"servicename": u"Mandos",
1663
u"use_dbus": u"True",
1664
u"use_ipv6": u"True",
1874
1668
# Parse config file for server-global settings
1875
1669
server_config = configparser.SafeConfigParser(server_defaults)
1876
1670
del server_defaults
1877
1671
server_config.read(os.path.join(options.configdir,
1879
1673
# Convert the SafeConfigParser object to a dict
1880
1674
server_settings = server_config.defaults()
1881
1675
# Use the appropriate methods on the non-string config options
1882
for option in ("debug", "use_dbus", "use_ipv6"):
1883
server_settings[option] = server_config.getboolean("DEFAULT",
1676
for option in (u"debug", u"use_dbus", u"use_ipv6"):
1677
server_settings[option] = server_config.getboolean(u"DEFAULT",
1885
1679
if server_settings["port"]:
1886
server_settings["port"] = server_config.getint("DEFAULT",
1680
server_settings["port"] = server_config.getint(u"DEFAULT",
1888
1682
del server_config
1890
1684
# Override the settings from the config file with command line
1891
1685
# options, if set.
1892
for option in ("interface", "address", "port", "debug",
1893
"priority", "servicename", "configdir",
1894
"use_dbus", "use_ipv6", "debuglevel"):
1686
for option in (u"interface", u"address", u"port", u"debug",
1687
u"priority", u"servicename", u"configdir",
1688
u"use_dbus", u"use_ipv6", u"debuglevel"):
1895
1689
value = getattr(options, option)
1896
1690
if value is not None:
1897
1691
server_settings[option] = value
1905
1699
##################################################################
1907
1701
# For convenience
1908
debug = server_settings["debug"]
1909
debuglevel = server_settings["debuglevel"]
1910
use_dbus = server_settings["use_dbus"]
1911
use_ipv6 = server_settings["use_ipv6"]
1913
if server_settings["servicename"] != "Mandos":
1702
debug = server_settings[u"debug"]
1703
debuglevel = server_settings[u"debuglevel"]
1704
use_dbus = server_settings[u"use_dbus"]
1705
use_ipv6 = server_settings[u"use_ipv6"]
1707
if server_settings[u"servicename"] != u"Mandos":
1914
1708
syslogger.setFormatter(logging.Formatter
1915
('Mandos (%s) [%%(process)d]:'
1916
' %%(levelname)s: %%(message)s'
1917
% server_settings["servicename"]))
1709
(u'Mandos (%s) [%%(process)d]:'
1710
u' %%(levelname)s: %%(message)s'
1711
% server_settings[u"servicename"]))
1919
1713
# Parse config file with clients
1920
client_defaults = { "timeout": "5m",
1921
"extended_timeout": "15m",
1923
"checker": "fping -q -- %%(host)s",
1925
"approval_delay": "0s",
1926
"approval_duration": "1s",
1714
client_defaults = { u"timeout": u"1h",
1716
u"checker": u"fping -q -- %%(host)s",
1718
u"approved_delay": u"0s",
1719
u"approved_duration": u"1s",
1928
1721
client_config = configparser.SafeConfigParser(client_defaults)
1929
client_config.read(os.path.join(server_settings["configdir"],
1722
client_config.read(os.path.join(server_settings[u"configdir"],
1932
1725
global mandos_dbus_service
1933
1726
mandos_dbus_service = None
1935
tcp_server = MandosServer((server_settings["address"],
1936
server_settings["port"]),
1728
tcp_server = MandosServer((server_settings[u"address"],
1729
server_settings[u"port"]),
1938
interface=(server_settings["interface"]
1731
interface=server_settings[u"interface"],
1940
1732
use_ipv6=use_ipv6,
1941
1733
gnutls_priority=
1942
server_settings["priority"],
1734
server_settings[u"priority"],
1943
1735
use_dbus=use_dbus)
1945
pidfilename = "/var/run/mandos.pid"
1947
pidfile = open(pidfilename, "w")
1949
logger.error("Could not open file %r", pidfilename)
1736
pidfilename = u"/var/run/mandos.pid"
1738
pidfile = open(pidfilename, u"w")
1740
logger.error(u"Could not open file %r", pidfilename)
1952
uid = pwd.getpwnam("_mandos").pw_uid
1953
gid = pwd.getpwnam("_mandos").pw_gid
1743
uid = pwd.getpwnam(u"_mandos").pw_uid
1744
gid = pwd.getpwnam(u"_mandos").pw_gid
1954
1745
except KeyError:
1956
uid = pwd.getpwnam("mandos").pw_uid
1957
gid = pwd.getpwnam("mandos").pw_gid
1747
uid = pwd.getpwnam(u"mandos").pw_uid
1748
gid = pwd.getpwnam(u"mandos").pw_gid
1958
1749
except KeyError:
1960
uid = pwd.getpwnam("nobody").pw_uid
1961
gid = pwd.getpwnam("nobody").pw_gid
1751
uid = pwd.getpwnam(u"nobody").pw_uid
1752
gid = pwd.getpwnam(u"nobody").pw_gid
1962
1753
except KeyError:
1968
except OSError as error:
1759
except OSError, error:
1969
1760
if error[0] != errno.EPERM:
1763
# Enable all possible GnuTLS debugging
1972
1766
if not debug and not debuglevel:
1973
1767
syslogger.setLevel(logging.WARNING)
1974
1768
console.setLevel(logging.WARNING)
2013
1801
# End of Avahi example code
2016
bus_name = dbus.service.BusName("se.recompile.Mandos",
1804
bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos",
2017
1805
bus, do_not_queue=True)
2018
old_bus_name = (dbus.service.BusName
2019
("se.bsnet.fukt.Mandos", bus,
2021
except dbus.exceptions.NameExistsException as e:
2022
logger.error(unicode(e) + ", disabling D-Bus")
1806
except dbus.exceptions.NameExistsException, e:
1807
logger.error(unicode(e) + u", disabling D-Bus")
2023
1808
use_dbus = False
2024
server_settings["use_dbus"] = False
1809
server_settings[u"use_dbus"] = False
2025
1810
tcp_server.use_dbus = False
2026
1811
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2027
service = AvahiService(name = server_settings["servicename"],
2028
servicetype = "_mandos._tcp",
1812
service = AvahiService(name = server_settings[u"servicename"],
1813
servicetype = u"_mandos._tcp",
2029
1814
protocol = protocol, bus = bus)
2030
1815
if server_settings["interface"]:
2031
1816
service.interface = (if_nametoindex
2032
(str(server_settings["interface"])))
1817
(str(server_settings[u"interface"])))
1820
# Close all input and output, do double fork, etc.
2034
1823
global multiprocessing_manager
2035
1824
multiprocessing_manager = multiprocessing.Manager()
2037
1826
client_class = Client
2039
client_class = functools.partial(ClientDBusTransitional,
1828
client_class = functools.partial(ClientDBus, bus = bus)
2041
1829
def client_config_items(config, section):
2042
1830
special_settings = {
2043
1831
"approved_by_default":
2081
1868
class MandosDBusService(dbus.service.Object):
2082
1869
"""A D-Bus proxy object"""
2083
1870
def __init__(self):
2084
dbus.service.Object.__init__(self, bus, "/")
2085
_interface = "se.recompile.Mandos"
1871
dbus.service.Object.__init__(self, bus, u"/")
1872
_interface = u"se.bsnet.fukt.Mandos"
2087
@dbus.service.signal(_interface, signature="o")
1874
@dbus.service.signal(_interface, signature=u"o")
2088
1875
def ClientAdded(self, objpath):
2092
@dbus.service.signal(_interface, signature="ss")
1879
@dbus.service.signal(_interface, signature=u"ss")
2093
1880
def ClientNotFound(self, fingerprint, address):
2097
@dbus.service.signal(_interface, signature="os")
1884
@dbus.service.signal(_interface, signature=u"os")
2098
1885
def ClientRemoved(self, objpath, name):
2102
@dbus.service.method(_interface, out_signature="ao")
1889
@dbus.service.method(_interface, out_signature=u"ao")
2103
1890
def GetAllClients(self):
2105
1892
return dbus.Array(c.dbus_object_path
2106
1893
for c in tcp_server.clients)
2108
1895
@dbus.service.method(_interface,
2109
out_signature="a{oa{sv}}")
1896
out_signature=u"a{oa{sv}}")
2110
1897
def GetAllClientsWithProperties(self):
2112
1899
return dbus.Dictionary(
2113
((c.dbus_object_path, c.GetAll(""))
1900
((c.dbus_object_path, c.GetAll(u""))
2114
1901
for c in tcp_server.clients),
1902
signature=u"oa{sv}")
2117
@dbus.service.method(_interface, in_signature="o")
1904
@dbus.service.method(_interface, in_signature=u"o")
2118
1905
def RemoveClient(self, object_path):
2120
1907
for c in tcp_server.clients: