161
158
" after %i retries, exiting.",
162
159
self.rename_count)
163
160
raise AvahiServiceError("Too many renames")
164
self.name = unicode(self.server
165
.GetAlternativeServiceName(self.name))
161
self.name = unicode(self.server.GetAlternativeServiceName(self.name))
166
162
logger.info("Changing Zeroconf service name to %r ...",
164
syslogger.setFormatter(logging.Formatter
165
('Mandos (%s) [%%(process)d]:'
166
' %%(levelname)s: %%(message)s'
171
except dbus.exceptions.DBusException as error:
171
except dbus.exceptions.DBusException, error:
172
172
logger.critical("DBusException: %s", error)
175
175
self.rename_count += 1
176
176
def remove(self):
177
177
"""Derived from the Avahi example code"""
178
if self.entry_group_state_changed_match is not None:
179
self.entry_group_state_changed_match.remove()
180
self.entry_group_state_changed_match = None
181
178
if self.group is not None:
182
179
self.group.Reset()
184
181
"""Derived from the Avahi example code"""
186
182
if self.group is None:
187
183
self.group = dbus.Interface(
188
184
self.bus.get_object(avahi.DBUS_NAME,
189
185
self.server.EntryGroupNew()),
190
186
avahi.DBUS_INTERFACE_ENTRY_GROUP)
191
self.entry_group_state_changed_match = (
192
self.group.connect_to_signal(
193
'StateChanged', self.entry_group_state_changed))
187
self.group.connect_to_signal('StateChanged',
189
.entry_group_state_changed)
194
190
logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
195
191
self.name, self.type)
196
192
self.group.AddService(
219
215
def cleanup(self):
220
216
"""Derived from the Avahi example code"""
221
217
if self.group is not None:
224
except (dbus.exceptions.UnknownMethodException,
225
dbus.exceptions.DBusException) as e:
227
219
self.group = None
229
def server_state_changed(self, state, error=None):
220
def server_state_changed(self, state):
230
221
"""Derived from the Avahi example code"""
231
222
logger.debug("Avahi server state change: %i", state)
232
bad_states = { avahi.SERVER_INVALID:
233
"Zeroconf server invalid",
234
avahi.SERVER_REGISTERING: None,
235
avahi.SERVER_COLLISION:
236
"Zeroconf server name collision",
237
avahi.SERVER_FAILURE:
238
"Zeroconf server failure" }
239
if state in bad_states:
240
if bad_states[state] is not None:
242
logger.error(bad_states[state])
244
logger.error(bad_states[state] + ": %r", error)
223
if state == avahi.SERVER_COLLISION:
224
logger.error("Zeroconf server name collision")
246
226
elif state == avahi.SERVER_RUNNING:
250
logger.debug("Unknown state: %r", state)
252
logger.debug("Unknown state: %r: %r", state, error)
253
228
def activate(self):
254
229
"""Derived from the Avahi example code"""
255
230
if self.server is None:
256
231
self.server = dbus.Interface(
257
232
self.bus.get_object(avahi.DBUS_NAME,
258
avahi.DBUS_PATH_SERVER,
259
follow_name_owner_changes=True),
233
avahi.DBUS_PATH_SERVER),
260
234
avahi.DBUS_INTERFACE_SERVER)
261
235
self.server.connect_to_signal("StateChanged",
262
236
self.server_state_changed)
263
237
self.server_state_changed(self.server.GetState())
265
class AvahiServiceToSyslog(AvahiService):
267
"""Add the new name to the syslog messages"""
268
ret = AvahiService.rename(self)
269
syslogger.setFormatter(logging.Formatter
270
('Mandos (%s) [%%(process)d]:'
271
' %%(levelname)s: %%(message)s'
275
def _timedelta_to_milliseconds(td):
276
"Convert a datetime.timedelta() to milliseconds"
277
return ((td.days * 24 * 60 * 60 * 1000)
278
+ (td.seconds * 1000)
279
+ (td.microseconds // 1000))
281
240
class Client(object):
282
241
"""A representation of a client host served by this server.
322
278
"host", "interval", "last_checked_ok",
323
279
"last_enabled", "name", "timeout")
282
def _timedelta_to_milliseconds(td):
283
"Convert a datetime.timedelta() to milliseconds"
284
return ((td.days * 24 * 60 * 60 * 1000)
285
+ (td.seconds * 1000)
286
+ (td.microseconds // 1000))
325
288
def timeout_milliseconds(self):
326
289
"Return the 'timeout' attribute in milliseconds"
327
return _timedelta_to_milliseconds(self.timeout)
329
def extended_timeout_milliseconds(self):
330
"Return the 'extended_timeout' attribute in milliseconds"
331
return _timedelta_to_milliseconds(self.extended_timeout)
290
return self._timedelta_to_milliseconds(self.timeout)
333
292
def interval_milliseconds(self):
334
293
"Return the 'interval' attribute in milliseconds"
335
return _timedelta_to_milliseconds(self.interval)
294
return self._timedelta_to_milliseconds(self.interval)
337
296
def approval_delay_milliseconds(self):
338
return _timedelta_to_milliseconds(self.approval_delay)
297
return self._timedelta_to_milliseconds(self.approval_delay)
340
299
def __init__(self, name = None, disable_hook=None, config=None):
341
300
"""Note: the 'checker' key in 'config' sets the
388
344
config["approval_delay"])
389
345
self.approval_duration = string_to_delta(
390
346
config["approval_duration"])
391
self.changedstate = (multiprocessing_manager
392
.Condition(multiprocessing_manager
347
self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
395
349
def send_changedstate(self):
396
350
self.changedstate.acquire()
397
351
self.changedstate.notify_all()
398
352
self.changedstate.release()
400
354
def enable(self):
401
355
"""Start this client's checker and timeout hooks"""
402
356
if getattr(self, "enabled", False):
403
357
# Already enabled
405
359
self.send_changedstate()
360
self.last_enabled = datetime.datetime.utcnow()
406
361
# Schedule a new checker to be started an 'interval' from now,
407
362
# and every interval from then on.
408
363
self.checker_initiator_tag = (gobject.timeout_add
409
364
(self.interval_milliseconds(),
410
365
self.start_checker))
411
366
# Schedule a disable() when 'timeout' has passed
412
self.expires = datetime.datetime.utcnow() + self.timeout
413
367
self.disable_initiator_tag = (gobject.timeout_add
414
368
(self.timeout_milliseconds(),
416
370
self.enabled = True
417
self.last_enabled = datetime.datetime.utcnow()
418
371
# Also start a new checker *right now*.
419
372
self.start_checker()
461
413
logger.warning("Checker for %(name)s crashed?",
464
def checked_ok(self, timeout=None):
416
def checked_ok(self):
465
417
"""Bump up the timeout for this client.
467
419
This should only be called when the client has been seen,
471
timeout = self.timeout
472
422
self.last_checked_ok = datetime.datetime.utcnow()
473
if self.disable_initiator_tag is not None:
474
gobject.source_remove(self.disable_initiator_tag)
475
if getattr(self, "enabled", False):
476
self.disable_initiator_tag = (gobject.timeout_add
477
(_timedelta_to_milliseconds
478
(timeout), self.disable))
479
self.expires = datetime.datetime.utcnow() + timeout
423
gobject.source_remove(self.disable_initiator_tag)
424
self.disable_initiator_tag = (gobject.timeout_add
425
(self.timeout_milliseconds(),
481
428
def need_approval(self):
482
429
self.last_approval_request = datetime.datetime.utcnow()
639
585
def _get_all_dbus_properties(self):
640
586
"""Returns a generator of (name, attribute) pairs
642
return ((prop.__get__(self)._dbus_name, prop.__get__(self))
643
for cls in self.__class__.__mro__
588
return ((prop._dbus_name, prop)
644
589
for name, prop in
645
inspect.getmembers(cls, self._is_dbus_property))
590
inspect.getmembers(self, self._is_dbus_property))
647
592
def _get_dbus_property(self, interface_name, property_name):
648
593
"""Returns a bound method if one exists which is a D-Bus
649
594
property with the specified name and interface.
651
for cls in self.__class__.__mro__:
652
for name, value in (inspect.getmembers
653
(cls, self._is_dbus_property)):
654
if (value._dbus_name == property_name
655
and value._dbus_interface == interface_name):
656
return value.__get__(self)
596
for name in (property_name,
597
property_name + "_dbus_property"):
598
prop = getattr(self, name, None)
600
or not self._is_dbus_property(prop)
601
or prop._dbus_name != property_name
602
or (interface_name and prop._dbus_interface
603
and interface_name != prop._dbus_interface)):
658
606
# No such property
659
607
raise DBusPropertyNotFound(self.dbus_object_path + ":"
660
608
+ interface_name + "."
756
704
xmlstring = document.toxml("utf-8")
757
705
document.unlink()
758
706
except (AttributeError, xml.dom.DOMException,
759
xml.parsers.expat.ExpatError) as error:
707
xml.parsers.expat.ExpatError), error:
760
708
logger.error("Failed to override Introspection method",
765
def datetime_to_dbus (dt, variant_level=0):
766
"""Convert a UTC datetime.datetime() to a D-Bus type."""
768
return dbus.String("", variant_level = variant_level)
769
return dbus.String(dt.isoformat(),
770
variant_level=variant_level)
772
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
774
"""Applied to an empty subclass of a D-Bus object, this metaclass
775
will add additional D-Bus attributes matching a certain pattern.
777
def __new__(mcs, name, bases, attr):
778
# Go through all the base classes which could have D-Bus
779
# methods, signals, or properties in them
780
for base in (b for b in bases
781
if issubclass(b, dbus.service.Object)):
782
# Go though all attributes of the base class
783
for attrname, attribute in inspect.getmembers(base):
784
# Ignore non-D-Bus attributes, and D-Bus attributes
785
# with the wrong interface name
786
if (not hasattr(attribute, "_dbus_interface")
787
or not attribute._dbus_interface
788
.startswith("se.recompile.Mandos")):
790
# Create an alternate D-Bus interface name based on
792
alt_interface = (attribute._dbus_interface
793
.replace("se.recompile.Mandos",
794
"se.bsnet.fukt.Mandos"))
795
# Is this a D-Bus signal?
796
if getattr(attribute, "_dbus_is_signal", False):
797
# Extract the original non-method function by
799
nonmethod_func = (dict(
800
zip(attribute.func_code.co_freevars,
801
attribute.__closure__))["func"]
803
# Create a new, but exactly alike, function
804
# object, and decorate it to be a new D-Bus signal
805
# with the alternate D-Bus interface name
806
new_function = (dbus.service.signal
808
attribute._dbus_signature)
810
nonmethod_func.func_code,
811
nonmethod_func.func_globals,
812
nonmethod_func.func_name,
813
nonmethod_func.func_defaults,
814
nonmethod_func.func_closure)))
815
# Define a creator of a function to call both the
816
# old and new functions, so both the old and new
817
# signals gets sent when the function is called
818
def fixscope(func1, func2):
819
"""This function is a scope container to pass
820
func1 and func2 to the "call_both" function
821
outside of its arguments"""
822
def call_both(*args, **kwargs):
823
"""This function will emit two D-Bus
824
signals by calling func1 and func2"""
825
func1(*args, **kwargs)
826
func2(*args, **kwargs)
828
# Create the "call_both" function and add it to
830
attr[attrname] = fixscope(attribute,
832
# Is this a D-Bus method?
833
elif getattr(attribute, "_dbus_is_method", False):
834
# Create a new, but exactly alike, function
835
# object. Decorate it to be a new D-Bus method
836
# with the alternate D-Bus interface name. Add it
838
attr[attrname] = (dbus.service.method
840
attribute._dbus_in_signature,
841
attribute._dbus_out_signature)
843
(attribute.func_code,
844
attribute.func_globals,
846
attribute.func_defaults,
847
attribute.func_closure)))
848
# Is this a D-Bus property?
849
elif getattr(attribute, "_dbus_is_property", False):
850
# Create a new, but exactly alike, function
851
# object, and decorate it to be a new D-Bus
852
# property with the alternate D-Bus interface
853
# name. Add it to the class.
854
attr[attrname] = (dbus_service_property
856
attribute._dbus_signature,
857
attribute._dbus_access,
859
._dbus_get_args_options
862
(attribute.func_code,
863
attribute.func_globals,
865
attribute.func_defaults,
866
attribute.func_closure)))
867
return type.__new__(mcs, name, bases, attr)
869
713
class ClientDBus(Client, DBusObjectWithProperties):
870
714
"""A Client class using D-Bus
893
737
DBusObjectWithProperties.__init__(self, self.bus,
894
738
self.dbus_object_path)
896
def notifychangeproperty(transform_func,
897
dbus_name, type_func=lambda x: x,
899
""" Modify a variable so that it's a property which announces
740
def _get_approvals_pending(self):
741
return self._approvals_pending
742
def _set_approvals_pending(self, value):
743
old_value = self._approvals_pending
744
self._approvals_pending = value
746
if (hasattr(self, "dbus_object_path")
747
and bval is not bool(old_value)):
748
dbus_bool = dbus.Boolean(bval, variant_level=1)
749
self.PropertyChanged(dbus.String("ApprovalPending"),
902
transform_fun: Function that takes a value and a variant_level
903
and transforms it to a D-Bus type.
904
dbus_name: D-Bus name of the variable
905
type_func: Function that transform the value before sending it
906
to the D-Bus. Default: no transform
907
variant_level: D-Bus variant level. Default: 1
909
attrname = "_{0}".format(dbus_name)
910
def setter(self, value):
911
if hasattr(self, "dbus_object_path"):
912
if (not hasattr(self, attrname) or
913
type_func(getattr(self, attrname, None))
914
!= type_func(value)):
915
dbus_value = transform_func(type_func(value),
918
self.PropertyChanged(dbus.String(dbus_name),
920
setattr(self, attrname, value)
922
return property(lambda self: getattr(self, attrname), setter)
925
expires = notifychangeproperty(datetime_to_dbus, "Expires")
926
approvals_pending = notifychangeproperty(dbus.Boolean,
929
enabled = notifychangeproperty(dbus.Boolean, "Enabled")
930
last_enabled = notifychangeproperty(datetime_to_dbus,
932
checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
933
type_func = lambda checker:
935
last_checked_ok = notifychangeproperty(datetime_to_dbus,
937
last_approval_request = notifychangeproperty(
938
datetime_to_dbus, "LastApprovalRequest")
939
approved_by_default = notifychangeproperty(dbus.Boolean,
941
approval_delay = notifychangeproperty(dbus.UInt16,
944
_timedelta_to_milliseconds)
945
approval_duration = notifychangeproperty(
946
dbus.UInt16, "ApprovalDuration",
947
type_func = _timedelta_to_milliseconds)
948
host = notifychangeproperty(dbus.String, "Host")
949
timeout = notifychangeproperty(dbus.UInt16, "Timeout",
951
_timedelta_to_milliseconds)
952
extended_timeout = notifychangeproperty(
953
dbus.UInt16, "ExtendedTimeout",
954
type_func = _timedelta_to_milliseconds)
955
interval = notifychangeproperty(dbus.UInt16,
958
_timedelta_to_milliseconds)
959
checker_command = notifychangeproperty(dbus.String, "Checker")
961
del notifychangeproperty
752
approvals_pending = property(_get_approvals_pending,
753
_set_approvals_pending)
754
del _get_approvals_pending, _set_approvals_pending
757
def _datetime_to_dbus(dt, variant_level=0):
758
"""Convert a UTC datetime.datetime() to a D-Bus type."""
759
return dbus.String(dt.isoformat(),
760
variant_level=variant_level)
763
oldstate = getattr(self, "enabled", False)
764
r = Client.enable(self)
765
if oldstate != self.enabled:
767
self.PropertyChanged(dbus.String("Enabled"),
768
dbus.Boolean(True, variant_level=1))
769
self.PropertyChanged(
770
dbus.String("LastEnabled"),
771
self._datetime_to_dbus(self.last_enabled,
775
def disable(self, quiet = False):
776
oldstate = getattr(self, "enabled", False)
777
r = Client.disable(self, quiet=quiet)
778
if not quiet and oldstate != self.enabled:
780
self.PropertyChanged(dbus.String("Enabled"),
781
dbus.Boolean(False, variant_level=1))
963
784
def __del__(self, *args, **kwargs):
988
812
return Client.checker_callback(self, pid, condition, command,
815
def checked_ok(self, *args, **kwargs):
816
r = Client.checked_ok(self, *args, **kwargs)
818
self.PropertyChanged(
819
dbus.String("LastCheckedOK"),
820
(self._datetime_to_dbus(self.last_checked_ok,
824
def need_approval(self, *args, **kwargs):
825
r = Client.need_approval(self, *args, **kwargs)
827
self.PropertyChanged(
828
dbus.String("LastApprovalRequest"),
829
(self._datetime_to_dbus(self.last_approval_request,
991
833
def start_checker(self, *args, **kwargs):
992
834
old_checker = self.checker
993
835
if self.checker is not None:
1000
842
and old_checker_pid != self.checker.pid):
1001
843
# Emit D-Bus signal
1002
844
self.CheckerStarted(self.current_checker_command)
845
self.PropertyChanged(
846
dbus.String("CheckerRunning"),
847
dbus.Boolean(True, variant_level=1))
850
def stop_checker(self, *args, **kwargs):
851
old_checker = getattr(self, "checker", None)
852
r = Client.stop_checker(self, *args, **kwargs)
853
if (old_checker is not None
854
and getattr(self, "checker", None) is None):
855
self.PropertyChanged(dbus.String("CheckerRunning"),
856
dbus.Boolean(False, variant_level=1))
1005
859
def _reset_approved(self):
1006
860
self._approved = None
1115
972
if value is None: # get
1116
973
return dbus.UInt64(self.approval_delay_milliseconds())
1117
974
self.approval_delay = datetime.timedelta(0, 0, 0, value)
976
self.PropertyChanged(dbus.String("ApprovalDelay"),
977
dbus.UInt64(value, variant_level=1))
1119
979
# ApprovalDuration - property
1120
980
@dbus_service_property(_interface, signature="t",
1121
981
access="readwrite")
1122
982
def ApprovalDuration_dbus_property(self, value=None):
1123
983
if value is None: # get
1124
return dbus.UInt64(_timedelta_to_milliseconds(
984
return dbus.UInt64(self._timedelta_to_milliseconds(
1125
985
self.approval_duration))
1126
986
self.approval_duration = datetime.timedelta(0, 0, 0, value)
988
self.PropertyChanged(dbus.String("ApprovalDuration"),
989
dbus.UInt64(value, variant_level=1))
1128
991
# Name - property
1129
992
@dbus_service_property(_interface, signature="s", access="read")
1142
1005
if value is None: # get
1143
1006
return dbus.String(self.host)
1144
1007
self.host = value
1009
self.PropertyChanged(dbus.String("Host"),
1010
dbus.String(value, variant_level=1))
1146
1012
# Created - property
1147
1013
@dbus_service_property(_interface, signature="s", access="read")
1148
1014
def Created_dbus_property(self):
1149
return dbus.String(datetime_to_dbus(self.created))
1015
return dbus.String(self._datetime_to_dbus(self.created))
1151
1017
# LastEnabled - property
1152
1018
@dbus_service_property(_interface, signature="s", access="read")
1153
1019
def LastEnabled_dbus_property(self):
1154
return datetime_to_dbus(self.last_enabled)
1020
if self.last_enabled is None:
1021
return dbus.String("")
1022
return dbus.String(self._datetime_to_dbus(self.last_enabled))
1156
1024
# Enabled - property
1157
1025
@dbus_service_property(_interface, signature="b",
1190
1060
if value is None: # get
1191
1061
return dbus.UInt64(self.timeout_milliseconds())
1192
1062
self.timeout = datetime.timedelta(0, 0, 0, value)
1064
self.PropertyChanged(dbus.String("Timeout"),
1065
dbus.UInt64(value, variant_level=1))
1193
1066
if getattr(self, "disable_initiator_tag", None) is None:
1195
1068
# Reschedule timeout
1196
1069
gobject.source_remove(self.disable_initiator_tag)
1197
1070
self.disable_initiator_tag = None
1199
time_to_die = _timedelta_to_milliseconds((self
1071
time_to_die = (self.
1072
_timedelta_to_milliseconds((self
1204
1077
if time_to_die <= 0:
1205
1078
# The timeout has passed
1208
self.expires = (datetime.datetime.utcnow()
1209
+ datetime.timedelta(milliseconds =
1211
1081
self.disable_initiator_tag = (gobject.timeout_add
1212
1082
(time_to_die, self.disable))
1214
# ExtendedTimeout - property
1215
@dbus_service_property(_interface, signature="t",
1217
def ExtendedTimeout_dbus_property(self, value=None):
1218
if value is None: # get
1219
return dbus.UInt64(self.extended_timeout_milliseconds())
1220
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1222
1084
# Interval - property
1223
1085
@dbus_service_property(_interface, signature="t",
1224
1086
access="readwrite")
1338
1205
if int(line.strip().split()[0]) > 1:
1339
1206
raise RuntimeError
1340
except (ValueError, IndexError, RuntimeError) as error:
1207
except (ValueError, IndexError, RuntimeError), error:
1341
1208
logger.error("Unknown protocol version: %s", error)
1344
1211
# Start GnuTLS connection
1346
1213
session.handshake()
1347
except gnutls.errors.GNUTLSError as error:
1214
except gnutls.errors.GNUTLSError, error:
1348
1215
logger.warning("Handshake failed: %s", error)
1349
1216
# Do not run session.bye() here: the session is not
1350
1217
# established. Just abandon the request.
1352
1219
logger.debug("Handshake succeeded")
1354
1221
approval_required = False
1357
1224
fpr = self.fingerprint(self.peer_certificate
1360
gnutls.errors.GNUTLSError) as error:
1226
except (TypeError, gnutls.errors.GNUTLSError), error:
1361
1227
logger.warning("Bad certificate: %s", error)
1363
1229
logger.debug("Fingerprint: %s", fpr)
1366
1232
client = ProxyClient(child_pipe, fpr,
1367
1233
self.client_address)
1540
1401
This function creates a new pipe in self.pipe
1542
1403
parent_pipe, self.child_pipe = multiprocessing.Pipe()
1544
proc = MultiprocessingMixIn.process_request(self, request,
1405
super(MultiprocessingMixInWithPipe,
1406
self).process_request(request, client_address)
1546
1407
self.child_pipe.close()
1547
self.add_pipe(parent_pipe, proc)
1549
def add_pipe(self, parent_pipe, proc):
1408
self.add_pipe(parent_pipe)
1410
def add_pipe(self, parent_pipe):
1550
1411
"""Dummy function; override as necessary"""
1551
raise NotImplementedError
1554
1414
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1555
1415
socketserver.TCPServer, object):
1640
1500
def server_activate(self):
1641
1501
if self.enabled:
1642
1502
return socketserver.TCPServer.server_activate(self)
1644
1503
def enable(self):
1645
1504
self.enabled = True
1647
def add_pipe(self, parent_pipe, proc):
1505
def add_pipe(self, parent_pipe):
1648
1506
# Call "handle_ipc" for both data and EOF events
1649
1507
gobject.io_add_watch(parent_pipe.fileno(),
1650
1508
gobject.IO_IN | gobject.IO_HUP,
1651
1509
functools.partial(self.handle_ipc,
1510
parent_pipe = parent_pipe))
1656
1512
def handle_ipc(self, source, condition, parent_pipe=None,
1657
proc = None, client_object=None):
1513
client_object=None):
1658
1514
condition_names = {
1659
1515
gobject.IO_IN: "IN", # There is data to read.
1660
1516
gobject.IO_OUT: "OUT", # Data can be written (without
1691
logger.info("Client not found for fingerprint: %s, ad"
1692
"dress: %s", fpr, address)
1545
logger.warning("Client not found for fingerprint: %s, ad"
1546
"dress: %s", fpr, address)
1693
1547
if self.use_dbus:
1694
1548
# Emit D-Bus signal
1695
mandos_dbus_service.ClientNotFound(fpr,
1549
mandos_dbus_service.ClientNotFound(fpr, address[0])
1697
1550
parent_pipe.send(False)
1700
1553
gobject.io_add_watch(parent_pipe.fileno(),
1701
1554
gobject.IO_IN | gobject.IO_HUP,
1702
1555
functools.partial(self.handle_ipc,
1556
parent_pipe = parent_pipe,
1557
client_object = client))
1708
1558
parent_pipe.send(True)
1709
# remove the old hook in favor of the new above hook on
1559
# remove the old hook in favor of the new above hook on same fileno
1712
1561
if command == 'funcall':
1713
1562
funcname = request[1]
1714
1563
args = request[2]
1715
1564
kwargs = request[3]
1717
parent_pipe.send(('data', getattr(client_object,
1566
parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
1721
1568
if command == 'getattr':
1722
1569
attrname = request[1]
1723
1570
if callable(client_object.__getattribute__(attrname)):
1724
1571
parent_pipe.send(('function',))
1726
parent_pipe.send(('data', client_object
1727
.__getattribute__(attrname)))
1573
parent_pipe.send(('data', client_object.__getattribute__(attrname)))
1729
1575
if command == 'setattr':
1730
1576
attrname = request[1]
1731
1577
value = request[2]
1732
1578
setattr(client_object, attrname, value)
1827
1673
##################################################################
1828
1674
# Parsing of options, both command line and config file
1830
parser = argparse.ArgumentParser()
1831
parser.add_argument("-v", "--version", action="version",
1832
version = "%%(prog)s %s" % version,
1833
help="show version number and exit")
1834
parser.add_argument("-i", "--interface", metavar="IF",
1835
help="Bind to interface IF")
1836
parser.add_argument("-a", "--address",
1837
help="Address to listen for requests on")
1838
parser.add_argument("-p", "--port", type=int,
1839
help="Port number to receive requests on")
1840
parser.add_argument("--check", action="store_true",
1841
help="Run self-test")
1842
parser.add_argument("--debug", action="store_true",
1843
help="Debug mode; run in foreground and log"
1845
parser.add_argument("--debuglevel", metavar="LEVEL",
1846
help="Debug level for stdout output")
1847
parser.add_argument("--priority", help="GnuTLS"
1848
" priority string (see GnuTLS documentation)")
1849
parser.add_argument("--servicename",
1850
metavar="NAME", help="Zeroconf service name")
1851
parser.add_argument("--configdir",
1852
default="/etc/mandos", metavar="DIR",
1853
help="Directory to search for configuration"
1855
parser.add_argument("--no-dbus", action="store_false",
1856
dest="use_dbus", help="Do not provide D-Bus"
1857
" system bus interface")
1858
parser.add_argument("--no-ipv6", action="store_false",
1859
dest="use_ipv6", help="Do not use IPv6")
1860
options = parser.parse_args()
1676
parser = optparse.OptionParser(version = "%%prog %s" % version)
1677
parser.add_option("-i", "--interface", type="string",
1678
metavar="IF", help="Bind to interface IF")
1679
parser.add_option("-a", "--address", type="string",
1680
help="Address to listen for requests on")
1681
parser.add_option("-p", "--port", type="int",
1682
help="Port number to receive requests on")
1683
parser.add_option("--check", action="store_true",
1684
help="Run self-test")
1685
parser.add_option("--debug", action="store_true",
1686
help="Debug mode; run in foreground and log to"
1688
parser.add_option("--debuglevel", type="string", metavar="LEVEL",
1689
help="Debug level for stdout output")
1690
parser.add_option("--priority", type="string", help="GnuTLS"
1691
" priority string (see GnuTLS documentation)")
1692
parser.add_option("--servicename", type="string",
1693
metavar="NAME", help="Zeroconf service name")
1694
parser.add_option("--configdir", type="string",
1695
default="/etc/mandos", metavar="DIR",
1696
help="Directory to search for configuration"
1698
parser.add_option("--no-dbus", action="store_false",
1699
dest="use_dbus", help="Do not provide D-Bus"
1700
" system bus interface")
1701
parser.add_option("--no-ipv6", action="store_false",
1702
dest="use_ipv6", help="Do not use IPv6")
1703
options = parser.parse_args()[0]
1862
1705
if options.check:
2018
1861
# End of Avahi example code
2021
bus_name = dbus.service.BusName("se.recompile.Mandos",
1864
bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
2022
1865
bus, do_not_queue=True)
2023
old_bus_name = (dbus.service.BusName
2024
("se.bsnet.fukt.Mandos", bus,
2026
except dbus.exceptions.NameExistsException as e:
1866
except dbus.exceptions.NameExistsException, e:
2027
1867
logger.error(unicode(e) + ", disabling D-Bus")
2028
1868
use_dbus = False
2029
1869
server_settings["use_dbus"] = False
2030
1870
tcp_server.use_dbus = False
2031
1871
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2032
service = AvahiServiceToSyslog(name =
2033
server_settings["servicename"],
2034
servicetype = "_mandos._tcp",
2035
protocol = protocol, bus = bus)
1872
service = AvahiService(name = server_settings["servicename"],
1873
servicetype = "_mandos._tcp",
1874
protocol = protocol, bus = bus)
2036
1875
if server_settings["interface"]:
2037
1876
service.interface = (if_nametoindex
2038
1877
(str(server_settings["interface"])))