226
98
class AvahiService(object):
227
"""An Avahi (Zeroconf) service.
230
100
interface: integer; avahi.IF_UNSPEC or an interface index.
231
101
Used to optionally bind to the specified interface.
232
name: string; Example: 'Mandos'
233
type: string; Example: '_mandos._tcp'.
234
See <http://www.dns-sd.org/ServiceTypes.html>
235
port: integer; what port to announce
236
TXT: list of strings; TXT record for the service
237
domain: string; Domain to publish on, default to .local if empty.
238
host: string; Host to publish records for, default is localhost
239
max_renames: integer; maximum number of renames
240
rename_count: integer; counter so we only rename after collisions
241
a sensible number of times
242
group: D-Bus Entry Group
244
bus: dbus.SystemBus()
102
name = string; Example: "Mandos"
103
type = string; Example: "_mandos._tcp".
104
See <http://www.dns-sd.org/ServiceTypes.html>
105
port = integer; what port to announce
106
TXT = list of strings; TXT record for the service
107
domain = string; Domain to publish on, default to .local if empty.
108
host = string; Host to publish records for, default to localhost
110
max_renames = integer; maximum number of renames
111
rename_count = integer; counter so we only rename after collisions
112
a sensible number of times
246
114
def __init__(self, interface = avahi.IF_UNSPEC, name = None,
247
servicetype = None, port = None, TXT = None,
248
domain = "", host = "", max_renames = 32768,
249
protocol = avahi.PROTO_UNSPEC, bus = None):
115
type = None, port = None, TXT = None, domain = "",
116
host = "", max_renames = 12):
117
"""An Avahi (Zeroconf) service. """
250
118
self.interface = interface
252
self.type = servicetype
254
self.TXT = TXT if TXT is not None else []
255
126
self.domain = domain
257
128
self.rename_count = 0
258
self.max_renames = max_renames
259
self.protocol = protocol
260
self.group = None # our entry group
263
self.entry_group_state_changed_match = None
264
129
def rename(self):
265
130
"""Derived from the Avahi example code"""
266
131
if self.rename_count >= self.max_renames:
267
logger.critical("No suitable Zeroconf service name found"
268
" after %i retries, exiting.",
132
logger.critical(u"No suitable service name found after %i"
133
u" retries, exiting.", rename_count)
270
134
raise AvahiServiceError("Too many renames")
271
self.name = unicode(self.server
272
.GetAlternativeServiceName(self.name))
273
logger.info("Changing Zeroconf service name to %r ...",
135
name = server.GetAlternativeServiceName(name)
136
logger.notice(u"Changing name to %r ...", name)
278
except dbus.exceptions.DBusException as error:
279
logger.critical("DBusException: %s", error)
282
139
self.rename_count += 1
283
140
def remove(self):
284
141
"""Derived from the Avahi example code"""
285
if self.entry_group_state_changed_match is not None:
286
self.entry_group_state_changed_match.remove()
287
self.entry_group_state_changed_match = None
288
if self.group is not None:
142
if group is not None:
291
145
"""Derived from the Avahi example code"""
293
if self.group is None:
294
self.group = dbus.Interface(
295
self.bus.get_object(avahi.DBUS_NAME,
296
self.server.EntryGroupNew()),
297
avahi.DBUS_INTERFACE_ENTRY_GROUP)
298
self.entry_group_state_changed_match = (
299
self.group.connect_to_signal(
300
'StateChanged', self.entry_group_state_changed))
301
logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
302
self.name, self.type)
303
self.group.AddService(
306
dbus.UInt32(0), # flags
307
self.name, self.type,
308
self.domain, self.host,
309
dbus.UInt16(self.port),
310
avahi.string_array_to_txt_array(self.TXT))
312
def entry_group_state_changed(self, state, error):
313
"""Derived from the Avahi example code"""
314
logger.debug("Avahi entry group state change: %i", state)
316
if state == avahi.ENTRY_GROUP_ESTABLISHED:
317
logger.debug("Zeroconf service established.")
318
elif state == avahi.ENTRY_GROUP_COLLISION:
319
logger.info("Zeroconf service name collision.")
321
elif state == avahi.ENTRY_GROUP_FAILURE:
322
logger.critical("Avahi: Error in group state changed %s",
324
raise AvahiGroupError("State changed: %s"
327
"""Derived from the Avahi example code"""
328
if self.group is not None:
331
except (dbus.exceptions.UnknownMethodException,
332
dbus.exceptions.DBusException):
336
def server_state_changed(self, state, error=None):
337
"""Derived from the Avahi example code"""
338
logger.debug("Avahi server state change: %i", state)
339
bad_states = { avahi.SERVER_INVALID:
340
"Zeroconf server invalid",
341
avahi.SERVER_REGISTERING: None,
342
avahi.SERVER_COLLISION:
343
"Zeroconf server name collision",
344
avahi.SERVER_FAILURE:
345
"Zeroconf server failure" }
346
if state in bad_states:
347
if bad_states[state] is not None:
349
logger.error(bad_states[state])
351
logger.error(bad_states[state] + ": %r", error)
353
elif state == avahi.SERVER_RUNNING:
357
logger.debug("Unknown state: %r", state)
359
logger.debug("Unknown state: %r: %r", state, error)
361
"""Derived from the Avahi example code"""
362
if self.server is None:
363
self.server = dbus.Interface(
364
self.bus.get_object(avahi.DBUS_NAME,
365
avahi.DBUS_PATH_SERVER,
366
follow_name_owner_changes=True),
367
avahi.DBUS_INTERFACE_SERVER)
368
self.server.connect_to_signal("StateChanged",
369
self.server_state_changed)
370
self.server_state_changed(self.server.GetState())
372
class AvahiServiceToSyslog(AvahiService):
374
"""Add the new name to the syslog messages"""
375
ret = AvahiService.rename(self)
376
syslogger.setFormatter(logging.Formatter
377
('Mandos (%s) [%%(process)d]:'
378
' %%(levelname)s: %%(message)s'
382
def timedelta_to_milliseconds(td):
383
"Convert a datetime.timedelta() to milliseconds"
384
return ((td.days * 24 * 60 * 60 * 1000)
385
+ (td.seconds * 1000)
386
+ (td.microseconds // 1000))
148
group = dbus.Interface\
149
(bus.get_object(avahi.DBUS_NAME,
150
server.EntryGroupNew()),
151
avahi.DBUS_INTERFACE_ENTRY_GROUP)
152
group.connect_to_signal('StateChanged',
153
entry_group_state_changed)
154
logger.debug(u"Adding service '%s' of type '%s' ...",
155
service.name, service.type)
157
self.interface, # interface
158
avahi.PROTO_INET6, # protocol
159
dbus.UInt32(0), # flags
160
self.name, self.type,
161
self.domain, self.host,
162
dbus.UInt16(self.port),
163
avahi.string_array_to_txt_array(self.TXT))
166
# From the Avahi example code:
167
group = None # our entry group
168
# End of Avahi example code
388
171
class Client(object):
389
172
"""A representation of a client host served by this server.
392
approved: bool(); 'None' if not yet approved/disapproved
393
approval_delay: datetime.timedelta(); Time to wait for approval
394
approval_duration: datetime.timedelta(); Duration of one approval
395
checker: subprocess.Popen(); a running checker process used
396
to see if the client lives.
397
'None' if no process is running.
398
checker_callback_tag: a gobject event source tag, or None
399
checker_command: string; External command which is run to check
400
if client lives. %() expansions are done at
174
name: string; from the config file, used in log messages
175
fingerprint: string (40 or 32 hexadecimal digits); used to
176
uniquely identify the client
177
secret: bytestring; sent verbatim (over TLS) to client
178
fqdn: string (FQDN); available for use by the checker command
179
created: datetime.datetime(); object creation, not client host
180
last_checked_ok: datetime.datetime() or None if not yet checked OK
181
timeout: datetime.timedelta(); How long from last_checked_ok
182
until this client is invalid
183
interval: datetime.timedelta(); How often to start a new checker
184
stop_hook: If set, called by stop() as stop_hook(self)
185
checker: subprocess.Popen(); a running checker process used
186
to see if the client lives.
187
'None' if no process is running.
188
checker_initiator_tag: a gobject event source tag, or None
189
stop_initiator_tag: - '' -
190
checker_callback_tag: - '' -
191
checker_command: string; External command which is run to check if
192
client lives. %() expansions are done at
401
193
runtime with vars(self) as dict, so that for
402
194
instance %(name)s can be used in the command.
403
checker_initiator_tag: a gobject event source tag, or None
404
created: datetime.datetime(); (UTC) object creation
405
client_structure: Object describing what attributes a client has
406
and is used for storing the client at exit
407
current_checker_command: string; current running checker_command
408
disable_initiator_tag: a gobject event source tag, or None
410
fingerprint: string (40 or 32 hexadecimal digits); used to
411
uniquely identify the client
412
host: string; available for use by the checker command
413
interval: datetime.timedelta(); How often to start a new checker
414
last_approval_request: datetime.datetime(); (UTC) or None
415
last_checked_ok: datetime.datetime(); (UTC) or None
416
last_checker_status: integer between 0 and 255 reflecting exit
417
status of last checker. -1 reflects crashed
419
last_enabled: datetime.datetime(); (UTC) or None
420
name: string; from the config file, used in log messages and
422
secret: bytestring; sent verbatim (over TLS) to client
423
timeout: datetime.timedelta(); How long from last_checked_ok
424
until this client is disabled
425
extended_timeout: extra long timeout when password has been sent
426
runtime_expansions: Allowed attributes for runtime expansion.
427
expires: datetime.datetime(); time (UTC) when a client will be
196
_timeout: Real variable for 'timeout'
197
_interval: Real variable for 'interval'
198
_timeout_milliseconds: Used when calling gobject.timeout_add()
199
_interval_milliseconds: - '' -
431
runtime_expansions = ("approval_delay", "approval_duration",
432
"created", "enabled", "fingerprint",
433
"host", "interval", "last_checked_ok",
434
"last_enabled", "name", "timeout")
435
client_defaults = { "timeout": "5m",
436
"extended_timeout": "15m",
438
"checker": "fping -q -- %%(host)s",
440
"approval_delay": "0s",
441
"approval_duration": "1s",
442
"approved_by_default": "True",
446
def timeout_milliseconds(self):
447
"Return the 'timeout' attribute in milliseconds"
448
return timedelta_to_milliseconds(self.timeout)
450
def extended_timeout_milliseconds(self):
451
"Return the 'extended_timeout' attribute in milliseconds"
452
return timedelta_to_milliseconds(self.extended_timeout)
454
def interval_milliseconds(self):
455
"Return the 'interval' attribute in milliseconds"
456
return timedelta_to_milliseconds(self.interval)
458
def approval_delay_milliseconds(self):
459
return timedelta_to_milliseconds(self.approval_delay)
462
def config_parser(config):
463
"""Construct a new dict of client settings of this form:
464
{ client_name: {setting_name: value, ...}, ...}
465
with exceptions for any special settings as defined above.
466
NOTE: Must be a pure function. Must return the same result
467
value given the same arguments.
470
for client_name in config.sections():
471
section = dict(config.items(client_name))
472
client = settings[client_name] = {}
474
client["host"] = section["host"]
475
# Reformat values from string types to Python types
476
client["approved_by_default"] = config.getboolean(
477
client_name, "approved_by_default")
478
client["enabled"] = config.getboolean(client_name, "enabled")
480
client["fingerprint"] = (section["fingerprint"].upper()
482
if "secret" in section:
483
client["secret"] = section["secret"].decode("base64")
484
elif "secfile" in section:
485
with open(os.path.expanduser(os.path.expandvars
486
(section["secfile"])),
488
client["secret"] = secfile.read()
490
raise TypeError("No secret or secfile for section %s"
492
client["timeout"] = string_to_delta(section["timeout"])
493
client["extended_timeout"] = string_to_delta(
494
section["extended_timeout"])
495
client["interval"] = string_to_delta(section["interval"])
496
client["approval_delay"] = string_to_delta(
497
section["approval_delay"])
498
client["approval_duration"] = string_to_delta(
499
section["approval_duration"])
500
client["checker_command"] = section["checker"]
501
client["last_approval_request"] = None
502
client["last_checked_ok"] = None
503
client["last_checker_status"] = None
508
def __init__(self, settings, name = None):
509
"""Note: the 'checker' key in 'config' sets the
510
'checker_command' attribute and *not* the 'checker'
201
def _set_timeout(self, timeout):
202
"Setter function for 'timeout' attribute"
203
self._timeout = timeout
204
self._timeout_milliseconds = ((self.timeout.days
205
* 24 * 60 * 60 * 1000)
206
+ (self.timeout.seconds * 1000)
207
+ (self.timeout.microseconds
209
timeout = property(lambda self: self._timeout,
212
def _set_interval(self, interval):
213
"Setter function for 'interval' attribute"
214
self._interval = interval
215
self._interval_milliseconds = ((self.interval.days
216
* 24 * 60 * 60 * 1000)
217
+ (self.interval.seconds
219
+ (self.interval.microseconds
221
interval = property(lambda self: self._interval,
224
def __init__(self, name=None, stop_hook=None, fingerprint=None,
225
secret=None, secfile=None, fqdn=None, timeout=None,
226
interval=-1, checker=None):
227
"""Note: the 'checker' argument sets the 'checker_command'
228
attribute and not the 'checker' attribute.."""
513
# adding all client settings
514
for setting, value in settings.iteritems():
515
setattr(self, setting, value)
518
if not hasattr(self, "last_enabled"):
519
self.last_enabled = datetime.datetime.utcnow()
520
if not hasattr(self, "expires"):
521
self.expires = (datetime.datetime.utcnow()
230
logger.debug(u"Creating client %r", self.name)
231
# Uppercase and remove spaces from fingerprint
232
# for later comparison purposes with return value of
233
# the fingerprint() function
234
self.fingerprint = fingerprint.upper().replace(u" ", u"")
235
logger.debug(u" Fingerprint: %s", self.fingerprint)
237
self.secret = secret.decode(u"base64")
240
self.secret = sf.read()
524
self.last_enabled = None
527
logger.debug("Creating client %r", self.name)
528
# Uppercase and remove spaces from fingerprint for later
529
# comparison purposes with return value from the fingerprint()
531
logger.debug(" Fingerprint: %s", self.fingerprint)
532
self.created = settings.get("created", datetime.datetime.utcnow())
534
# attributes specific for this server instance
243
raise TypeError(u"No secret or secfile for client %s"
246
self.created = datetime.datetime.now()
247
self.last_checked_ok = None
248
self.timeout = string_to_delta(timeout)
249
self.interval = string_to_delta(interval)
250
self.stop_hook = stop_hook
535
251
self.checker = None
536
252
self.checker_initiator_tag = None
537
self.disable_initiator_tag = None
253
self.stop_initiator_tag = None
538
254
self.checker_callback_tag = None
539
self.current_checker_command = None
541
self.approvals_pending = 0
542
self.changedstate = (multiprocessing_manager
543
.Condition(multiprocessing_manager
545
self.client_structure = [attr for attr in
546
self.__dict__.iterkeys()
547
if not attr.startswith("_")]
548
self.client_structure.append("client_structure")
550
for name, t in inspect.getmembers(type(self),
554
if not name.startswith("_"):
555
self.client_structure.append(name)
557
# Send notice to process children that client state has changed
558
def send_changedstate(self):
559
with self.changedstate:
560
self.changedstate.notify_all()
255
self.check_command = checker
563
257
"""Start this client's checker and timeout hooks"""
564
if getattr(self, "enabled", False):
567
self.send_changedstate()
568
self.expires = datetime.datetime.utcnow() + self.timeout
570
self.last_enabled = datetime.datetime.utcnow()
573
def disable(self, quiet=True):
574
"""Disable this client."""
575
if not getattr(self, "enabled", False):
258
# Schedule a new checker to be started an 'interval' from now,
259
# and every interval from then on.
260
self.checker_initiator_tag = gobject.timeout_add\
261
(self._interval_milliseconds,
263
# Also start a new checker *right now*.
265
# Schedule a stop() when 'timeout' has passed
266
self.stop_initiator_tag = gobject.timeout_add\
267
(self._timeout_milliseconds,
271
The possibility that a client might be restarted is left open,
272
but not currently used."""
273
# If this client doesn't have a secret, it is already stopped.
275
logger.debug(u"Stopping client %s", self.name)
578
self.send_changedstate()
580
logger.info("Disabling client %s", self.name)
581
if getattr(self, "disable_initiator_tag", False):
582
gobject.source_remove(self.disable_initiator_tag)
583
self.disable_initiator_tag = None
279
if getattr(self, "stop_initiator_tag", False):
280
gobject.source_remove(self.stop_initiator_tag)
281
self.stop_initiator_tag = None
585
282
if getattr(self, "checker_initiator_tag", False):
586
283
gobject.source_remove(self.checker_initiator_tag)
587
284
self.checker_initiator_tag = None
588
285
self.stop_checker()
590
288
# Do not run this again if called by a gobject.timeout_add
593
290
def __del__(self):
596
def init_checker(self):
597
# Schedule a new checker to be started an 'interval' from now,
598
# and every interval from then on.
599
self.checker_initiator_tag = (gobject.timeout_add
600
(self.interval_milliseconds(),
602
# Schedule a disable() when 'timeout' has passed
603
self.disable_initiator_tag = (gobject.timeout_add
604
(self.timeout_milliseconds(),
606
# Also start a new checker *right now*.
609
def checker_callback(self, pid, condition, command):
291
self.stop_hook = None
293
def checker_callback(self, pid, condition):
610
294
"""The checker has completed, so take appropriate actions."""
295
now = datetime.datetime.now()
611
296
self.checker_callback_tag = None
612
297
self.checker = None
613
if os.WIFEXITED(condition):
614
self.last_checker_status = os.WEXITSTATUS(condition)
615
if self.last_checker_status == 0:
616
logger.info("Checker for %(name)s succeeded",
620
logger.info("Checker for %(name)s failed",
623
self.last_checker_status = -1
624
logger.warning("Checker for %(name)s crashed?",
298
if os.WIFEXITED(condition) \
299
and (os.WEXITSTATUS(condition) == 0):
300
logger.debug(u"Checker for %(name)s succeeded",
302
self.last_checked_ok = now
303
gobject.source_remove(self.stop_initiator_tag)
304
self.stop_initiator_tag = gobject.timeout_add\
305
(self._timeout_milliseconds,
307
elif not os.WIFEXITED(condition):
308
logger.warning(u"Checker for %(name)s crashed?",
627
def checked_ok(self, timeout=None):
628
"""Bump up the timeout for this client.
630
This should only be called when the client has been seen,
634
timeout = self.timeout
635
self.last_checked_ok = datetime.datetime.utcnow()
636
if self.disable_initiator_tag is not None:
637
gobject.source_remove(self.disable_initiator_tag)
638
if getattr(self, "enabled", False):
639
self.disable_initiator_tag = (gobject.timeout_add
640
(timedelta_to_milliseconds
641
(timeout), self.disable))
642
self.expires = datetime.datetime.utcnow() + timeout
644
def need_approval(self):
645
self.last_approval_request = datetime.datetime.utcnow()
311
logger.debug(u"Checker for %(name)s failed",
647
313
def start_checker(self):
648
314
"""Start a new checker subprocess if one is not running.
650
315
If a checker already exists, leave it running and do
652
317
# The reason for not killing a running checker is that if we
729
361
logger.debug("Stopping checker for %(name)s", vars(self))
731
363
os.kill(self.checker.pid, signal.SIGTERM)
733
365
#if self.checker.poll() is None:
734
366
# os.kill(self.checker.pid, signal.SIGKILL)
735
except OSError as error:
367
except OSError, error:
736
368
if error.errno != errno.ESRCH: # No such process
738
370
self.checker = None
741
def dbus_service_property(dbus_interface, signature="v",
742
access="readwrite", byte_arrays=False):
743
"""Decorators for marking methods of a DBusObjectWithProperties to
744
become properties on the D-Bus.
746
The decorated method will be called with no arguments by "Get"
747
and with one argument by "Set".
749
The parameters, where they are supported, are the same as
750
dbus.service.method, except there is only "signature", since the
751
type from Get() and the type sent to Set() is the same.
753
# Encoding deeply encoded byte arrays is not supported yet by the
754
# "Set" method, so we fail early here:
755
if byte_arrays and signature != "ay":
756
raise ValueError("Byte arrays not supported for non-'ay'"
757
" signature %r" % signature)
759
func._dbus_is_property = True
760
func._dbus_interface = dbus_interface
761
func._dbus_signature = signature
762
func._dbus_access = access
763
func._dbus_name = func.__name__
764
if func._dbus_name.endswith("_dbus_property"):
765
func._dbus_name = func._dbus_name[:-14]
766
func._dbus_get_args_options = {'byte_arrays': byte_arrays }
771
class DBusPropertyException(dbus.exceptions.DBusException):
772
"""A base class for D-Bus property-related exceptions
774
def __unicode__(self):
775
return unicode(str(self))
778
class DBusPropertyAccessException(DBusPropertyException):
779
"""A property's access permissions disallows an operation.
784
class DBusPropertyNotFound(DBusPropertyException):
785
"""An attempt was made to access a non-existing property.
790
class DBusObjectWithProperties(dbus.service.Object):
791
"""A D-Bus object with properties.
793
Classes inheriting from this can use the dbus_service_property
794
decorator to expose methods as D-Bus properties. It exposes the
795
standard Get(), Set(), and GetAll() methods on the D-Bus.
799
def _is_dbus_property(obj):
800
return getattr(obj, "_dbus_is_property", False)
802
def _get_all_dbus_properties(self):
803
"""Returns a generator of (name, attribute) pairs
805
return ((prop.__get__(self)._dbus_name, prop.__get__(self))
806
for cls in self.__class__.__mro__
808
inspect.getmembers(cls, self._is_dbus_property))
810
def _get_dbus_property(self, interface_name, property_name):
811
"""Returns a bound method if one exists which is a D-Bus
812
property with the specified name and interface.
814
for cls in self.__class__.__mro__:
815
for name, value in (inspect.getmembers
816
(cls, self._is_dbus_property)):
817
if (value._dbus_name == property_name
818
and value._dbus_interface == interface_name):
819
return value.__get__(self)
822
raise DBusPropertyNotFound(self.dbus_object_path + ":"
823
+ interface_name + "."
826
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
828
def Get(self, interface_name, property_name):
829
"""Standard D-Bus property Get() method, see D-Bus standard.
831
prop = self._get_dbus_property(interface_name, property_name)
832
if prop._dbus_access == "write":
833
raise DBusPropertyAccessException(property_name)
835
if not hasattr(value, "variant_level"):
837
return type(value)(value, variant_level=value.variant_level+1)
839
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
840
def Set(self, interface_name, property_name, value):
841
"""Standard D-Bus property Set() method, see D-Bus standard.
843
prop = self._get_dbus_property(interface_name, property_name)
844
if prop._dbus_access == "read":
845
raise DBusPropertyAccessException(property_name)
846
if prop._dbus_get_args_options["byte_arrays"]:
847
# The byte_arrays option is not supported yet on
848
# signatures other than "ay".
849
if prop._dbus_signature != "ay":
851
value = dbus.ByteArray(''.join(unichr(byte)
855
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
856
out_signature="a{sv}")
857
def GetAll(self, interface_name):
858
"""Standard D-Bus property GetAll() method, see D-Bus
861
Note: Will not include properties with access="write".
864
for name, prop in self._get_all_dbus_properties():
866
and interface_name != prop._dbus_interface):
867
# Interface non-empty but did not match
869
# Ignore write-only properties
870
if prop._dbus_access == "write":
873
if not hasattr(value, "variant_level"):
874
properties[name] = value
876
properties[name] = type(value)(value, variant_level=
877
value.variant_level+1)
878
return dbus.Dictionary(properties, signature="sv")
880
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
882
path_keyword='object_path',
883
connection_keyword='connection')
884
def Introspect(self, object_path, connection):
885
"""Standard D-Bus method, overloaded to insert property tags.
887
xmlstring = dbus.service.Object.Introspect(self, object_path,
890
document = xml.dom.minidom.parseString(xmlstring)
891
def make_tag(document, name, prop):
892
e = document.createElement("property")
893
e.setAttribute("name", name)
894
e.setAttribute("type", prop._dbus_signature)
895
e.setAttribute("access", prop._dbus_access)
897
for if_tag in document.getElementsByTagName("interface"):
898
for tag in (make_tag(document, name, prop)
900
in self._get_all_dbus_properties()
901
if prop._dbus_interface
902
== if_tag.getAttribute("name")):
903
if_tag.appendChild(tag)
904
# Add the names to the return values for the
905
# "org.freedesktop.DBus.Properties" methods
906
if (if_tag.getAttribute("name")
907
== "org.freedesktop.DBus.Properties"):
908
for cn in if_tag.getElementsByTagName("method"):
909
if cn.getAttribute("name") == "Get":
910
for arg in cn.getElementsByTagName("arg"):
911
if (arg.getAttribute("direction")
913
arg.setAttribute("name", "value")
914
elif cn.getAttribute("name") == "GetAll":
915
for arg in cn.getElementsByTagName("arg"):
916
if (arg.getAttribute("direction")
918
arg.setAttribute("name", "props")
919
xmlstring = document.toxml("utf-8")
921
except (AttributeError, xml.dom.DOMException,
922
xml.parsers.expat.ExpatError) as error:
923
logger.error("Failed to override Introspection method",
928
def datetime_to_dbus (dt, variant_level=0):
929
"""Convert a UTC datetime.datetime() to a D-Bus type."""
931
return dbus.String("", variant_level = variant_level)
932
return dbus.String(dt.isoformat(),
933
variant_level=variant_level)
936
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
938
"""Applied to an empty subclass of a D-Bus object, this metaclass
939
will add additional D-Bus attributes matching a certain pattern.
941
def __new__(mcs, name, bases, attr):
942
# Go through all the base classes which could have D-Bus
943
# methods, signals, or properties in them
944
for base in (b for b in bases
945
if issubclass(b, dbus.service.Object)):
946
# Go though all attributes of the base class
947
for attrname, attribute in inspect.getmembers(base):
948
# Ignore non-D-Bus attributes, and D-Bus attributes
949
# with the wrong interface name
950
if (not hasattr(attribute, "_dbus_interface")
951
or not attribute._dbus_interface
952
.startswith("se.recompile.Mandos")):
954
# Create an alternate D-Bus interface name based on
956
alt_interface = (attribute._dbus_interface
957
.replace("se.recompile.Mandos",
958
"se.bsnet.fukt.Mandos"))
959
# Is this a D-Bus signal?
960
if getattr(attribute, "_dbus_is_signal", False):
961
# Extract the original non-method function by
963
nonmethod_func = (dict(
964
zip(attribute.func_code.co_freevars,
965
attribute.__closure__))["func"]
967
# Create a new, but exactly alike, function
968
# object, and decorate it to be a new D-Bus signal
969
# with the alternate D-Bus interface name
970
new_function = (dbus.service.signal
972
attribute._dbus_signature)
974
nonmethod_func.func_code,
975
nonmethod_func.func_globals,
976
nonmethod_func.func_name,
977
nonmethod_func.func_defaults,
978
nonmethod_func.func_closure)))
979
# Define a creator of a function to call both the
980
# old and new functions, so both the old and new
981
# signals gets sent when the function is called
982
def fixscope(func1, func2):
983
"""This function is a scope container to pass
984
func1 and func2 to the "call_both" function
985
outside of its arguments"""
986
def call_both(*args, **kwargs):
987
"""This function will emit two D-Bus
988
signals by calling func1 and func2"""
989
func1(*args, **kwargs)
990
func2(*args, **kwargs)
992
# Create the "call_both" function and add it to
994
attr[attrname] = fixscope(attribute,
996
# Is this a D-Bus method?
997
elif getattr(attribute, "_dbus_is_method", False):
998
# Create a new, but exactly alike, function
999
# object. Decorate it to be a new D-Bus method
1000
# with the alternate D-Bus interface name. Add it
1002
attr[attrname] = (dbus.service.method
1004
attribute._dbus_in_signature,
1005
attribute._dbus_out_signature)
1007
(attribute.func_code,
1008
attribute.func_globals,
1009
attribute.func_name,
1010
attribute.func_defaults,
1011
attribute.func_closure)))
1012
# Is this a D-Bus property?
1013
elif getattr(attribute, "_dbus_is_property", False):
1014
# Create a new, but exactly alike, function
1015
# object, and decorate it to be a new D-Bus
1016
# property with the alternate D-Bus interface
1017
# name. Add it to the class.
1018
attr[attrname] = (dbus_service_property
1020
attribute._dbus_signature,
1021
attribute._dbus_access,
1023
._dbus_get_args_options
1026
(attribute.func_code,
1027
attribute.func_globals,
1028
attribute.func_name,
1029
attribute.func_defaults,
1030
attribute.func_closure)))
1031
return type.__new__(mcs, name, bases, attr)
1034
class ClientDBus(Client, DBusObjectWithProperties):
1035
"""A Client class using D-Bus
1038
dbus_object_path: dbus.ObjectPath
1039
bus: dbus.SystemBus()
1042
runtime_expansions = (Client.runtime_expansions
1043
+ ("dbus_object_path",))
1045
# dbus.service.Object doesn't use super(), so we can't either.
1047
def __init__(self, bus = None, *args, **kwargs):
1049
Client.__init__(self, *args, **kwargs)
1050
self._approvals_pending = 0
1052
self._approvals_pending = 0
1053
# Only now, when this client is initialized, can it show up on
1055
client_object_name = unicode(self.name).translate(
1056
{ord("."): ord("_"),
1057
ord("-"): ord("_")})
1058
self.dbus_object_path = (dbus.ObjectPath
1059
("/clients/" + client_object_name))
1060
DBusObjectWithProperties.__init__(self, self.bus,
1061
self.dbus_object_path)
1063
def notifychangeproperty(transform_func,
1064
dbus_name, type_func=lambda x: x,
1066
""" Modify a variable so that it's a property which announces
1067
its changes to DBus.
1069
transform_fun: Function that takes a value and a variant_level
1070
and transforms it to a D-Bus type.
1071
dbus_name: D-Bus name of the variable
1072
type_func: Function that transform the value before sending it
1073
to the D-Bus. Default: no transform
1074
variant_level: D-Bus variant level. Default: 1
1076
attrname = "_{0}".format(dbus_name)
1077
def setter(self, value):
1078
if hasattr(self, "dbus_object_path"):
1079
if (not hasattr(self, attrname) or
1080
type_func(getattr(self, attrname, None))
1081
!= type_func(value)):
1082
dbus_value = transform_func(type_func(value),
1085
self.PropertyChanged(dbus.String(dbus_name),
1087
setattr(self, attrname, value)
1089
return property(lambda self: getattr(self, attrname), setter)
1092
expires = notifychangeproperty(datetime_to_dbus, "Expires")
1093
approvals_pending = notifychangeproperty(dbus.Boolean,
1096
enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1097
last_enabled = notifychangeproperty(datetime_to_dbus,
1099
checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
1100
type_func = lambda checker:
1101
checker is not None)
1102
last_checked_ok = notifychangeproperty(datetime_to_dbus,
1104
last_approval_request = notifychangeproperty(
1105
datetime_to_dbus, "LastApprovalRequest")
1106
approved_by_default = notifychangeproperty(dbus.Boolean,
1107
"ApprovedByDefault")
1108
approval_delay = notifychangeproperty(dbus.UInt64,
1111
timedelta_to_milliseconds)
1112
approval_duration = notifychangeproperty(
1113
dbus.UInt64, "ApprovalDuration",
1114
type_func = timedelta_to_milliseconds)
1115
host = notifychangeproperty(dbus.String, "Host")
1116
timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1118
timedelta_to_milliseconds)
1119
extended_timeout = notifychangeproperty(
1120
dbus.UInt64, "ExtendedTimeout",
1121
type_func = timedelta_to_milliseconds)
1122
interval = notifychangeproperty(dbus.UInt64,
1125
timedelta_to_milliseconds)
1126
checker_command = notifychangeproperty(dbus.String, "Checker")
1128
del notifychangeproperty
1130
def __del__(self, *args, **kwargs):
1132
self.remove_from_connection()
1135
if hasattr(DBusObjectWithProperties, "__del__"):
1136
DBusObjectWithProperties.__del__(self, *args, **kwargs)
1137
Client.__del__(self, *args, **kwargs)
1139
def checker_callback(self, pid, condition, command,
1141
self.checker_callback_tag = None
1143
if os.WIFEXITED(condition):
1144
exitstatus = os.WEXITSTATUS(condition)
1146
self.CheckerCompleted(dbus.Int16(exitstatus),
1147
dbus.Int64(condition),
1148
dbus.String(command))
1151
self.CheckerCompleted(dbus.Int16(-1),
1152
dbus.Int64(condition),
1153
dbus.String(command))
1155
return Client.checker_callback(self, pid, condition, command,
1158
def start_checker(self, *args, **kwargs):
1159
old_checker = self.checker
1160
if self.checker is not None:
1161
old_checker_pid = self.checker.pid
1163
old_checker_pid = None
1164
r = Client.start_checker(self, *args, **kwargs)
1165
# Only if new checker process was started
1166
if (self.checker is not None
1167
and old_checker_pid != self.checker.pid):
1169
self.CheckerStarted(self.current_checker_command)
1172
def _reset_approved(self):
1173
self.approved = None
1176
def approve(self, value=True):
1177
self.send_changedstate()
1178
self.approved = value
1179
gobject.timeout_add(timedelta_to_milliseconds
1180
(self.approval_duration),
1181
self._reset_approved)
1184
## D-Bus methods, signals & properties
1185
_interface = "se.recompile.Mandos.Client"
1189
# CheckerCompleted - signal
1190
@dbus.service.signal(_interface, signature="nxs")
1191
def CheckerCompleted(self, exitcode, waitstatus, command):
1195
# CheckerStarted - signal
1196
@dbus.service.signal(_interface, signature="s")
1197
def CheckerStarted(self, command):
1201
# PropertyChanged - signal
1202
@dbus.service.signal(_interface, signature="sv")
1203
def PropertyChanged(self, property, value):
1207
# GotSecret - signal
1208
@dbus.service.signal(_interface)
1209
def GotSecret(self):
1211
Is sent after a successful transfer of secret from the Mandos
1212
server to mandos-client
1217
@dbus.service.signal(_interface, signature="s")
1218
def Rejected(self, reason):
1222
# NeedApproval - signal
1223
@dbus.service.signal(_interface, signature="tb")
1224
def NeedApproval(self, timeout, default):
1226
return self.need_approval()
1228
# NeRwequest - signal
1229
@dbus.service.signal(_interface, signature="s")
1230
def NewRequest(self, ip):
1232
Is sent after a client request a password.
1239
@dbus.service.method(_interface, in_signature="b")
1240
def Approve(self, value):
1243
# CheckedOK - method
1244
@dbus.service.method(_interface)
1245
def CheckedOK(self):
1249
@dbus.service.method(_interface)
1254
# StartChecker - method
1255
@dbus.service.method(_interface)
1256
def StartChecker(self):
1258
self.start_checker()
1261
@dbus.service.method(_interface)
1266
# StopChecker - method
1267
@dbus.service.method(_interface)
1268
def StopChecker(self):
1273
# ApprovalPending - property
1274
@dbus_service_property(_interface, signature="b", access="read")
1275
def ApprovalPending_dbus_property(self):
1276
return dbus.Boolean(bool(self.approvals_pending))
1278
# ApprovedByDefault - property
1279
@dbus_service_property(_interface, signature="b",
1281
def ApprovedByDefault_dbus_property(self, value=None):
1282
if value is None: # get
1283
return dbus.Boolean(self.approved_by_default)
1284
self.approved_by_default = bool(value)
1286
# ApprovalDelay - property
1287
@dbus_service_property(_interface, signature="t",
1289
def ApprovalDelay_dbus_property(self, value=None):
1290
if value is None: # get
1291
return dbus.UInt64(self.approval_delay_milliseconds())
1292
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1294
# ApprovalDuration - property
1295
@dbus_service_property(_interface, signature="t",
1297
def ApprovalDuration_dbus_property(self, value=None):
1298
if value is None: # get
1299
return dbus.UInt64(timedelta_to_milliseconds(
1300
self.approval_duration))
1301
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1304
@dbus_service_property(_interface, signature="s", access="read")
1305
def Name_dbus_property(self):
1306
return dbus.String(self.name)
1308
# Fingerprint - property
1309
@dbus_service_property(_interface, signature="s", access="read")
1310
def Fingerprint_dbus_property(self):
1311
return dbus.String(self.fingerprint)
1314
@dbus_service_property(_interface, signature="s",
1316
def Host_dbus_property(self, value=None):
1317
if value is None: # get
1318
return dbus.String(self.host)
1319
self.host = unicode(value)
1321
# Created - property
1322
@dbus_service_property(_interface, signature="s", access="read")
1323
def Created_dbus_property(self):
1324
return datetime_to_dbus(self.created)
1326
# LastEnabled - property
1327
@dbus_service_property(_interface, signature="s", access="read")
1328
def LastEnabled_dbus_property(self):
1329
return datetime_to_dbus(self.last_enabled)
1331
# Enabled - property
1332
@dbus_service_property(_interface, signature="b",
1334
def Enabled_dbus_property(self, value=None):
1335
if value is None: # get
1336
return dbus.Boolean(self.enabled)
1342
# LastCheckedOK - property
1343
@dbus_service_property(_interface, signature="s",
1345
def LastCheckedOK_dbus_property(self, value=None):
1346
if value is not None:
1349
return datetime_to_dbus(self.last_checked_ok)
1351
# Expires - property
1352
@dbus_service_property(_interface, signature="s", access="read")
1353
def Expires_dbus_property(self):
1354
return datetime_to_dbus(self.expires)
1356
# LastApprovalRequest - property
1357
@dbus_service_property(_interface, signature="s", access="read")
1358
def LastApprovalRequest_dbus_property(self):
1359
return datetime_to_dbus(self.last_approval_request)
1361
# Timeout - property
1362
@dbus_service_property(_interface, signature="t",
1364
def Timeout_dbus_property(self, value=None):
1365
if value is None: # get
1366
return dbus.UInt64(self.timeout_milliseconds())
1367
self.timeout = datetime.timedelta(0, 0, 0, value)
1368
if getattr(self, "disable_initiator_tag", None) is None:
1370
# Reschedule timeout
1371
gobject.source_remove(self.disable_initiator_tag)
1372
self.disable_initiator_tag = None
1374
time_to_die = timedelta_to_milliseconds((self
1379
if time_to_die <= 0:
1380
# The timeout has passed
1383
self.expires = (datetime.datetime.utcnow()
1384
+ datetime.timedelta(milliseconds =
1386
self.disable_initiator_tag = (gobject.timeout_add
1387
(time_to_die, self.disable))
1389
# ExtendedTimeout - property
1390
@dbus_service_property(_interface, signature="t",
1392
def ExtendedTimeout_dbus_property(self, value=None):
1393
if value is None: # get
1394
return dbus.UInt64(self.extended_timeout_milliseconds())
1395
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1397
# Interval - property
1398
@dbus_service_property(_interface, signature="t",
1400
def Interval_dbus_property(self, value=None):
1401
if value is None: # get
1402
return dbus.UInt64(self.interval_milliseconds())
1403
self.interval = datetime.timedelta(0, 0, 0, value)
1404
if getattr(self, "checker_initiator_tag", None) is None:
1407
# Reschedule checker run
1408
gobject.source_remove(self.checker_initiator_tag)
1409
self.checker_initiator_tag = (gobject.timeout_add
1410
(value, self.start_checker))
1411
self.start_checker() # Start one now, too
1413
# Checker - property
1414
@dbus_service_property(_interface, signature="s",
1416
def Checker_dbus_property(self, value=None):
1417
if value is None: # get
1418
return dbus.String(self.checker_command)
1419
self.checker_command = unicode(value)
1421
# CheckerRunning - property
1422
@dbus_service_property(_interface, signature="b",
1424
def CheckerRunning_dbus_property(self, value=None):
1425
if value is None: # get
1426
return dbus.Boolean(self.checker is not None)
1428
self.start_checker()
1432
# ObjectPath - property
1433
@dbus_service_property(_interface, signature="o", access="read")
1434
def ObjectPath_dbus_property(self):
1435
return self.dbus_object_path # is already a dbus.ObjectPath
1438
@dbus_service_property(_interface, signature="ay",
1439
access="write", byte_arrays=True)
1440
def Secret_dbus_property(self, value):
1441
self.secret = str(value)
1446
class ProxyClient(object):
1447
def __init__(self, child_pipe, fpr, address):
1448
self._pipe = child_pipe
1449
self._pipe.send(('init', fpr, address))
1450
if not self._pipe.recv():
1453
def __getattribute__(self, name):
1455
return super(ProxyClient, self).__getattribute__(name)
1456
self._pipe.send(('getattr', name))
1457
data = self._pipe.recv()
1458
if data[0] == 'data':
1460
if data[0] == 'function':
1461
def func(*args, **kwargs):
1462
self._pipe.send(('funcall', name, args, kwargs))
1463
return self._pipe.recv()[1]
1466
def __setattr__(self, name, value):
1468
return super(ProxyClient, self).__setattr__(name, value)
1469
self._pipe.send(('setattr', name, value))
1472
class ClientDBusTransitional(ClientDBus):
1473
__metaclass__ = AlternateDBusNamesMetaclass
1476
class ClientHandler(socketserver.BaseRequestHandler, object):
1477
"""A class to handle client connections.
1479
Instantiated once for each connection to handle it.
371
def still_valid(self):
372
"""Has the timeout not yet passed for this client?"""
373
now = datetime.datetime.now()
374
if self.last_checked_ok is None:
375
return now < (self.created + self.timeout)
377
return now < (self.last_checked_ok + self.timeout)
380
def peer_certificate(session):
381
"Return the peer's OpenPGP certificate as a bytestring"
382
# If not an OpenPGP certificate...
383
if gnutls.library.functions.gnutls_certificate_type_get\
384
(session._c_object) \
385
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP:
386
# ...do the normal thing
387
return session.peer_certificate
388
list_size = ctypes.c_uint()
389
cert_list = gnutls.library.functions.gnutls_certificate_get_peers\
390
(session._c_object, ctypes.byref(list_size))
391
if list_size.value == 0:
394
return ctypes.string_at(cert.data, cert.size)
397
def fingerprint(openpgp):
398
"Convert an OpenPGP bytestring to a hexdigit fingerprint string"
399
# New empty GnuTLS certificate
400
crt = gnutls.library.types.gnutls_openpgp_crt_t()
401
gnutls.library.functions.gnutls_openpgp_crt_init\
403
# New GnuTLS "datum" with the OpenPGP public key
404
datum = gnutls.library.types.gnutls_datum_t\
405
(ctypes.cast(ctypes.c_char_p(openpgp),
406
ctypes.POINTER(ctypes.c_ubyte)),
407
ctypes.c_uint(len(openpgp)))
408
# Import the OpenPGP public key into the certificate
409
ret = gnutls.library.functions.gnutls_openpgp_crt_import\
412
gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
413
# New buffer for the fingerprint
414
buffer = ctypes.create_string_buffer(20)
415
buffer_length = ctypes.c_size_t()
416
# Get the fingerprint from the certificate into the buffer
417
gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint\
418
(crt, ctypes.byref(buffer), ctypes.byref(buffer_length))
419
# Deinit the certificate
420
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
421
# Convert the buffer to a Python bytestring
422
fpr = ctypes.string_at(buffer, buffer_length.value)
423
# Convert the bytestring to hexadecimal notation
424
hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
428
class tcp_handler(SocketServer.BaseRequestHandler, object):
429
"""A TCP request handler class.
430
Instantiated by IPv6_TCPServer for each request to handle it.
1480
431
Note: This will run in its own forked process."""
1482
433
def handle(self):
1483
with contextlib.closing(self.server.child_pipe) as child_pipe:
1484
logger.info("TCP connection from: %s",
1485
unicode(self.client_address))
1486
logger.debug("Pipe FD: %d",
1487
self.server.child_pipe.fileno())
1489
session = (gnutls.connection
1490
.ClientSession(self.request,
1492
.X509Credentials()))
1494
# Note: gnutls.connection.X509Credentials is really a
1495
# generic GnuTLS certificate credentials object so long as
1496
# no X.509 keys are added to it. Therefore, we can use it
1497
# here despite using OpenPGP certificates.
1499
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1500
# "+AES-256-CBC", "+SHA1",
1501
# "+COMP-NULL", "+CTYPE-OPENPGP",
1503
# Use a fallback default, since this MUST be set.
1504
priority = self.server.gnutls_priority
1505
if priority is None:
1507
(gnutls.library.functions
1508
.gnutls_priority_set_direct(session._c_object,
1511
# Start communication using the Mandos protocol
1512
# Get protocol number
1513
line = self.request.makefile().readline()
1514
logger.debug("Protocol version: %r", line)
1516
if int(line.strip().split()[0]) > 1:
1518
except (ValueError, IndexError, RuntimeError) as error:
1519
logger.error("Unknown protocol version: %s", error)
1522
# Start GnuTLS connection
1525
except gnutls.errors.GNUTLSError as error:
1526
logger.warning("Handshake failed: %s", error)
1527
# Do not run session.bye() here: the session is not
1528
# established. Just abandon the request.
1530
logger.debug("Handshake succeeded")
1532
approval_required = False
1535
fpr = self.fingerprint(self.peer_certificate
1538
gnutls.errors.GNUTLSError) as error:
1539
logger.warning("Bad certificate: %s", error)
1541
logger.debug("Fingerprint: %s", fpr)
1544
client = ProxyClient(child_pipe, fpr,
1545
self.client_address)
1549
if self.server.use_dbus:
1551
client.NewRequest(str(self.client_address))
1553
if client.approval_delay:
1554
delay = client.approval_delay
1555
client.approvals_pending += 1
1556
approval_required = True
1559
if not client.enabled:
1560
logger.info("Client %s is disabled",
1562
if self.server.use_dbus:
1564
client.Rejected("Disabled")
1567
if client.approved or not client.approval_delay:
1568
#We are approved or approval is disabled
1570
elif client.approved is None:
1571
logger.info("Client %s needs approval",
1573
if self.server.use_dbus:
1575
client.NeedApproval(
1576
client.approval_delay_milliseconds(),
1577
client.approved_by_default)
1579
logger.warning("Client %s was not approved",
1581
if self.server.use_dbus:
1583
client.Rejected("Denied")
1586
#wait until timeout or approved
1587
time = datetime.datetime.now()
1588
client.changedstate.acquire()
1589
(client.changedstate.wait
1590
(float(client.timedelta_to_milliseconds(delay)
1592
client.changedstate.release()
1593
time2 = datetime.datetime.now()
1594
if (time2 - time) >= delay:
1595
if not client.approved_by_default:
1596
logger.warning("Client %s timed out while"
1597
" waiting for approval",
1599
if self.server.use_dbus:
1601
client.Rejected("Approval timed out")
1606
delay -= time2 - time
1609
while sent_size < len(client.secret):
1611
sent = session.send(client.secret[sent_size:])
1612
except gnutls.errors.GNUTLSError as error:
1613
logger.warning("gnutls send failed")
1615
logger.debug("Sent: %d, remaining: %d",
1616
sent, len(client.secret)
1617
- (sent_size + sent))
1620
logger.info("Sending secret to %s", client.name)
1621
# bump the timeout using extended_timeout
1622
client.checked_ok(client.extended_timeout)
1623
if self.server.use_dbus:
1628
if approval_required:
1629
client.approvals_pending -= 1
1632
except gnutls.errors.GNUTLSError as error:
1633
logger.warning("GnuTLS bye failed")
1636
def peer_certificate(session):
1637
"Return the peer's OpenPGP certificate as a bytestring"
1638
# If not an OpenPGP certificate...
1639
if (gnutls.library.functions
1640
.gnutls_certificate_type_get(session._c_object)
1641
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1642
# ...do the normal thing
1643
return session.peer_certificate
1644
list_size = ctypes.c_uint(1)
1645
cert_list = (gnutls.library.functions
1646
.gnutls_certificate_get_peers
1647
(session._c_object, ctypes.byref(list_size)))
1648
if not bool(cert_list) and list_size.value != 0:
1649
raise gnutls.errors.GNUTLSError("error getting peer"
1651
if list_size.value == 0:
1654
return ctypes.string_at(cert.data, cert.size)
1657
def fingerprint(openpgp):
1658
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
1659
# New GnuTLS "datum" with the OpenPGP public key
1660
datum = (gnutls.library.types
1661
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1664
ctypes.c_uint(len(openpgp))))
1665
# New empty GnuTLS certificate
1666
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1667
(gnutls.library.functions
1668
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
1669
# Import the OpenPGP public key into the certificate
1670
(gnutls.library.functions
1671
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1672
gnutls.library.constants
1673
.GNUTLS_OPENPGP_FMT_RAW))
1674
# Verify the self signature in the key
1675
crtverify = ctypes.c_uint()
1676
(gnutls.library.functions
1677
.gnutls_openpgp_crt_verify_self(crt, 0,
1678
ctypes.byref(crtverify)))
1679
if crtverify.value != 0:
1680
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1681
raise (gnutls.errors.CertificateSecurityError
1683
# New buffer for the fingerprint
1684
buf = ctypes.create_string_buffer(20)
1685
buf_len = ctypes.c_size_t()
1686
# Get the fingerprint from the certificate into the buffer
1687
(gnutls.library.functions
1688
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1689
ctypes.byref(buf_len)))
1690
# Deinit the certificate
1691
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1692
# Convert the buffer to a Python bytestring
1693
fpr = ctypes.string_at(buf, buf_len.value)
1694
# Convert the bytestring to hexadecimal notation
1695
hex_fpr = binascii.hexlify(fpr).upper()
1699
class MultiprocessingMixIn(object):
1700
"""Like socketserver.ThreadingMixIn, but with multiprocessing"""
1701
def sub_process_main(self, request, address):
1703
self.finish_request(request, address)
1705
self.handle_error(request, address)
1706
self.close_request(request)
1708
def process_request(self, request, address):
1709
"""Start a new process to process the request."""
1710
proc = multiprocessing.Process(target = self.sub_process_main,
1717
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1718
""" adds a pipe to the MixIn """
1719
def process_request(self, request, client_address):
1720
"""Overrides and wraps the original process_request().
1722
This function creates a new pipe in self.pipe
1724
parent_pipe, self.child_pipe = multiprocessing.Pipe()
1726
proc = MultiprocessingMixIn.process_request(self, request,
1728
self.child_pipe.close()
1729
self.add_pipe(parent_pipe, proc)
1731
def add_pipe(self, parent_pipe, proc):
1732
"""Dummy function; override as necessary"""
1733
raise NotImplementedError
1736
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1737
socketserver.TCPServer, object):
1738
"""IPv6-capable TCP server. Accepts 'None' as address and/or port
434
logger.debug(u"TCP connection from: %s",
435
unicode(self.client_address))
436
session = gnutls.connection.ClientSession\
437
(self.request, gnutls.connection.X509Credentials())
438
# Note: gnutls.connection.X509Credentials is really a generic
439
# GnuTLS certificate credentials object so long as no X.509
440
# keys are added to it. Therefore, we can use it here despite
441
# using OpenPGP certificates.
443
#priority = ':'.join(("NONE", "+VERS-TLS1.1", "+AES-256-CBC",
444
# "+SHA1", "+COMP-NULL", "+CTYPE-OPENPGP",
446
priority = "NORMAL" # Fallback default, since this
448
if self.server.settings["priority"]:
449
priority = self.server.settings["priority"]
450
gnutls.library.functions.gnutls_priority_set_direct\
451
(session._c_object, priority, None);
455
except gnutls.errors.GNUTLSError, error:
456
logger.debug(u"Handshake failed: %s", error)
457
# Do not run session.bye() here: the session is not
458
# established. Just abandon the request.
461
fpr = fingerprint(peer_certificate(session))
462
except (TypeError, gnutls.errors.GNUTLSError), error:
463
logger.debug(u"Bad certificate: %s", error)
466
logger.debug(u"Fingerprint: %s", fpr)
468
for c in self.server.clients:
469
if c.fingerprint == fpr:
473
logger.debug(u"Client not found for fingerprint: %s", fpr)
476
# Have to check if client.still_valid(), since it is possible
477
# that the client timed out while establishing the GnuTLS
479
if not client.still_valid():
480
logger.debug(u"Client %(name)s is invalid", vars(client))
484
while sent_size < len(client.secret):
485
sent = session.send(client.secret[sent_size:])
486
logger.debug(u"Sent: %d, remaining: %d",
487
sent, len(client.secret)
488
- (sent_size + sent))
493
class IPv6_TCPServer(SocketServer.ForkingTCPServer, object):
494
"""IPv6 TCP server. Accepts 'None' as address and/or port.
1741
enabled: Boolean; whether this server is activated yet
1742
interface: None or a network interface name (string)
1743
use_ipv6: Boolean; to use IPv6 or not
496
settings: Server settings
497
clients: Set() of Client objects
1745
def __init__(self, server_address, RequestHandlerClass,
1746
interface=None, use_ipv6=True):
1747
self.interface = interface
1749
self.address_family = socket.AF_INET6
1750
socketserver.TCPServer.__init__(self, server_address,
1751
RequestHandlerClass)
499
address_family = socket.AF_INET6
500
def __init__(self, *args, **kwargs):
501
if "settings" in kwargs:
502
self.settings = kwargs["settings"]
503
del kwargs["settings"]
504
if "clients" in kwargs:
505
self.clients = kwargs["clients"]
506
del kwargs["clients"]
507
return super(type(self), self).__init__(*args, **kwargs)
1752
508
def server_bind(self):
1753
509
"""This overrides the normal server_bind() function
1754
510
to bind to an interface if one was specified, and also NOT to
1755
511
bind to an address or port if they were not specified."""
1756
if self.interface is not None:
1757
if SO_BINDTODEVICE is None:
1758
logger.error("SO_BINDTODEVICE does not exist;"
1759
" cannot bind to interface %s",
1763
self.socket.setsockopt(socket.SOL_SOCKET,
1767
except socket.error as error:
1768
if error[0] == errno.EPERM:
1769
logger.error("No permission to"
1770
" bind to interface %s",
1772
elif error[0] == errno.ENOPROTOOPT:
1773
logger.error("SO_BINDTODEVICE not available;"
1774
" cannot bind to interface %s",
512
if self.settings["interface"]:
513
# 25 is from /usr/include/asm-i486/socket.h
514
SO_BINDTODEVICE = getattr(socket, "SO_BINDTODEVICE", 25)
516
self.socket.setsockopt(socket.SOL_SOCKET,
518
self.settings["interface"])
519
except socket.error, error:
520
if error[0] == errno.EPERM:
521
logger.warning(u"No permission to"
522
u" bind to interface %s",
523
self.settings["interface"])
1778
526
# Only bind(2) the socket if we really need to.
1779
527
if self.server_address[0] or self.server_address[1]:
1780
528
if not self.server_address[0]:
1781
if self.address_family == socket.AF_INET6:
1782
any_address = "::" # in6addr_any
1784
any_address = socket.INADDR_ANY
1785
self.server_address = (any_address,
530
self.server_address = (in6addr_any,
1786
531
self.server_address[1])
1787
elif not self.server_address[1]:
532
elif self.server_address[1] is None:
1788
533
self.server_address = (self.server_address[0],
1790
# if self.interface:
1791
# self.server_address = (self.server_address[0],
1796
return socketserver.TCPServer.server_bind(self)
1799
class MandosServer(IPv6_TCPServer):
1803
clients: set of Client objects
1804
gnutls_priority GnuTLS priority string
1805
use_dbus: Boolean; to emit D-Bus signals or not
1807
Assumes a gobject.MainLoop event loop.
1809
def __init__(self, server_address, RequestHandlerClass,
1810
interface=None, use_ipv6=True, clients=None,
1811
gnutls_priority=None, use_dbus=True):
1812
self.enabled = False
1813
self.clients = clients
1814
if self.clients is None:
1816
self.use_dbus = use_dbus
1817
self.gnutls_priority = gnutls_priority
1818
IPv6_TCPServer.__init__(self, server_address,
1819
RequestHandlerClass,
1820
interface = interface,
1821
use_ipv6 = use_ipv6)
1822
def server_activate(self):
1824
return socketserver.TCPServer.server_activate(self)
1829
def add_pipe(self, parent_pipe, proc):
1830
# Call "handle_ipc" for both data and EOF events
1831
gobject.io_add_watch(parent_pipe.fileno(),
1832
gobject.IO_IN | gobject.IO_HUP,
1833
functools.partial(self.handle_ipc,
1838
def handle_ipc(self, source, condition, parent_pipe=None,
1839
proc = None, client_object=None):
1841
gobject.IO_IN: "IN", # There is data to read.
1842
gobject.IO_OUT: "OUT", # Data can be written (without
1844
gobject.IO_PRI: "PRI", # There is urgent data to read.
1845
gobject.IO_ERR: "ERR", # Error condition.
1846
gobject.IO_HUP: "HUP" # Hung up (the connection has been
1847
# broken, usually for pipes and
1850
conditions_string = ' | '.join(name
1852
condition_names.iteritems()
1853
if cond & condition)
1854
# error, or the other end of multiprocessing.Pipe has closed
1855
if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
1856
# Wait for other process to exit
1860
# Read a request from the child
1861
request = parent_pipe.recv()
1862
command = request[0]
1864
if command == 'init':
1866
address = request[2]
1868
for c in self.clients.itervalues():
1869
if c.fingerprint == fpr:
1873
logger.info("Client not found for fingerprint: %s, ad"
1874
"dress: %s", fpr, address)
1877
mandos_dbus_service.ClientNotFound(fpr,
1879
parent_pipe.send(False)
1882
gobject.io_add_watch(parent_pipe.fileno(),
1883
gobject.IO_IN | gobject.IO_HUP,
1884
functools.partial(self.handle_ipc,
1890
parent_pipe.send(True)
1891
# remove the old hook in favor of the new above hook on
1894
if command == 'funcall':
1895
funcname = request[1]
1899
parent_pipe.send(('data', getattr(client_object,
1903
if command == 'getattr':
1904
attrname = request[1]
1905
if callable(client_object.__getattribute__(attrname)):
1906
parent_pipe.send(('function',))
1908
parent_pipe.send(('data', client_object
1909
.__getattribute__(attrname)))
1911
if command == 'setattr':
1912
attrname = request[1]
1914
setattr(client_object, attrname, value)
535
return super(type(self), self).server_bind()
1919
538
def string_to_delta(interval):
1920
539
"""Parse a string and return a datetime.timedelta
1922
541
>>> string_to_delta('7d')
1923
542
datetime.timedelta(7)
1924
543
>>> string_to_delta('60s')
2037
687
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
2038
688
"servicename": "Mandos",
2043
"statedir": "/var/lib/mandos"
2046
691
# Parse config file for server-global settings
2047
server_config = configparser.SafeConfigParser(server_defaults)
692
server_config = ConfigParser.SafeConfigParser(server_defaults)
2048
693
del server_defaults
2049
server_config.read(os.path.join(options.configdir,
694
server_config.read(os.path.join(options.configdir, "server.conf"))
695
server_section = "server"
2051
696
# Convert the SafeConfigParser object to a dict
2052
server_settings = server_config.defaults()
2053
# Use the appropriate methods on the non-string config options
2054
for option in ("debug", "use_dbus", "use_ipv6"):
2055
server_settings[option] = server_config.getboolean("DEFAULT",
2057
if server_settings["port"]:
2058
server_settings["port"] = server_config.getint("DEFAULT",
697
server_settings = dict(server_config.items(server_section))
698
# Use getboolean on the boolean config option
699
server_settings["debug"] = server_config.getboolean\
700
(server_section, "debug")
2060
701
del server_config
2062
703
# Override the settings from the config file with command line
2063
704
# options, if set.
2064
705
for option in ("interface", "address", "port", "debug",
2065
"priority", "servicename", "configdir",
2066
"use_dbus", "use_ipv6", "debuglevel", "restore",
706
"priority", "servicename", "configdir"):
2068
707
value = getattr(options, option)
2069
708
if value is not None:
2070
709
server_settings[option] = value
2072
# Force all strings to be unicode
2073
for option in server_settings.keys():
2074
if type(server_settings[option]) is str:
2075
server_settings[option] = unicode(server_settings[option])
2076
711
# Now we have our good server settings in "server_settings"
2078
##################################################################
2081
debug = server_settings["debug"]
2082
debuglevel = server_settings["debuglevel"]
2083
use_dbus = server_settings["use_dbus"]
2084
use_ipv6 = server_settings["use_ipv6"]
2085
stored_state_path = os.path.join(server_settings["statedir"],
2089
initlogger(debug, logging.DEBUG)
2094
level = getattr(logging, debuglevel.upper())
2095
initlogger(debug, level)
2097
if server_settings["servicename"] != "Mandos":
2098
syslogger.setFormatter(logging.Formatter
2099
('Mandos (%s) [%%(process)d]:'
2100
' %%(levelname)s: %%(message)s'
2101
% server_settings["servicename"]))
2103
713
# Parse config file with clients
2104
client_config = configparser.SafeConfigParser(Client.client_defaults)
714
client_defaults = { "timeout": "1h",
716
"checker": "fping -q -- %%(fqdn)s",
718
client_config = ConfigParser.SafeConfigParser(client_defaults)
2105
719
client_config.read(os.path.join(server_settings["configdir"],
2106
720
"clients.conf"))
2108
global mandos_dbus_service
2109
mandos_dbus_service = None
2111
tcp_server = MandosServer((server_settings["address"],
2112
server_settings["port"]),
2114
interface=(server_settings["interface"]
2118
server_settings["priority"],
2121
pidfilename = "/var/run/mandos.pid"
2123
pidfile = open(pidfilename, "w")
2125
logger.error("Could not open file %r", pidfilename)
2128
uid = pwd.getpwnam("_mandos").pw_uid
2129
gid = pwd.getpwnam("_mandos").pw_gid
2132
uid = pwd.getpwnam("mandos").pw_uid
2133
gid = pwd.getpwnam("mandos").pw_gid
2136
uid = pwd.getpwnam("nobody").pw_uid
2137
gid = pwd.getpwnam("nobody").pw_gid
2144
except OSError as error:
2145
if error[0] != errno.EPERM:
2149
# Enable all possible GnuTLS debugging
2151
# "Use a log level over 10 to enable all debugging options."
2153
gnutls.library.functions.gnutls_global_set_log_level(11)
2155
@gnutls.library.types.gnutls_log_func
2156
def debug_gnutls(level, string):
2157
logger.debug("GnuTLS: %s", string[:-1])
2159
(gnutls.library.functions
2160
.gnutls_global_set_log_function(debug_gnutls))
2162
# Redirect stdin so all checkers get /dev/null
2163
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2164
os.dup2(null, sys.stdin.fileno())
2168
# Need to fork before connecting to D-Bus
2170
# Close all input and output, do double fork, etc.
2173
gobject.threads_init()
723
service = AvahiService(name = server_settings["servicename"],
724
type = "_mandos._tcp", );
725
if server_settings["interface"]:
726
service.interface = if_nametoindex(server_settings["interface"])
2175
728
global main_loop
2176
731
# From the Avahi example code
2177
732
DBusGMainLoop(set_as_default=True )
2178
733
main_loop = gobject.MainLoop()
2179
734
bus = dbus.SystemBus()
735
server = dbus.Interface(
736
bus.get_object( avahi.DBUS_NAME, avahi.DBUS_PATH_SERVER ),
737
avahi.DBUS_INTERFACE_SERVER )
2180
738
# End of Avahi example code
2183
bus_name = dbus.service.BusName("se.recompile.Mandos",
2184
bus, do_not_queue=True)
2185
old_bus_name = (dbus.service.BusName
2186
("se.bsnet.fukt.Mandos", bus,
2188
except dbus.exceptions.NameExistsException as e:
2189
logger.error(unicode(e) + ", disabling D-Bus")
2191
server_settings["use_dbus"] = False
2192
tcp_server.use_dbus = False
2193
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2194
service = AvahiServiceToSyslog(name =
2195
server_settings["servicename"],
2196
servicetype = "_mandos._tcp",
2197
protocol = protocol, bus = bus)
2198
if server_settings["interface"]:
2199
service.interface = (if_nametoindex
2200
(str(server_settings["interface"])))
2202
global multiprocessing_manager
2203
multiprocessing_manager = multiprocessing.Manager()
2205
client_class = Client
2207
client_class = functools.partial(ClientDBusTransitional,
2210
client_settings = Client.config_parser(client_config)
2211
old_client_settings = {}
2214
# Get client data and settings from last running state.
2215
if server_settings["restore"]:
2217
with open(stored_state_path, "rb") as stored_state:
2218
clients_data, old_client_settings = (pickle.load
2220
os.remove(stored_state_path)
2221
except IOError as e:
2222
logger.warning("Could not load persistent state: {0}"
2224
if e.errno != errno.ENOENT:
2226
except EOFError as e:
2227
logger.warning("Could not load persistent state: "
2228
"EOFError: {0}".format(e))
2230
with PGPEngine() as pgp:
2231
for client_name, client in clients_data.iteritems():
2232
# Decide which value to use after restoring saved state.
2233
# We have three different values: Old config file,
2234
# new config file, and saved state.
2235
# New config value takes precedence if it differs from old
2236
# config value, otherwise use saved state.
2237
for name, value in client_settings[client_name].items():
2239
# For each value in new config, check if it
2240
# differs from the old config value (Except for
2241
# the "secret" attribute)
2242
if (name != "secret" and
2243
value != old_client_settings[client_name]
2245
client[name] = value
2249
# Clients who has passed its expire date can still be
2250
# enabled if its last checker was successful. Clients
2251
# whose checker failed before we stored its state is
2252
# assumed to have failed all checkers during downtime.
2253
if client["enabled"]:
2254
if datetime.datetime.utcnow() >= client["expires"]:
2255
if not client["last_checked_ok"]:
2257
"disabling client {0} - Client never "
2258
"performed a successfull checker"
2259
.format(client["name"]))
2260
client["enabled"] = False
2261
elif client["last_checker_status"] != 0:
2263
"disabling client {0} - Client "
2264
"last checker failed with error code {1}"
2265
.format(client["name"],
2266
client["last_checker_status"]))
2267
client["enabled"] = False
2269
client["expires"] = (datetime.datetime
2271
+ client["timeout"])
2272
logger.debug("Last checker succeeded,"
2273
" keeping {0} enabled"
2274
.format(client["name"]))
2276
client["secret"] = (
2277
pgp.decrypt(client["encrypted_secret"],
2278
client_settings[client_name]
2281
# If decryption fails, we use secret from new settings
2282
logger.debug("Failed to decrypt {0} old secret"
2283
.format(client_name))
2284
client["secret"] = (
2285
client_settings[client_name]["secret"])
2288
# Add/remove clients based on new changes made to config
2289
for client_name in set(old_client_settings) - set(client_settings):
2290
del clients_data[client_name]
2291
for client_name in set(client_settings) - set(old_client_settings):
2292
clients_data[client_name] = client_settings[client_name]
2294
# Create clients all clients
2295
for client_name, client in clients_data.iteritems():
2296
tcp_server.clients[client_name] = client_class(
2297
name = client_name, settings = client)
2299
if not tcp_server.clients:
2300
logger.warning("No clients defined")
740
debug = server_settings["debug"]
743
console = logging.StreamHandler()
744
# console.setLevel(logging.DEBUG)
745
console.setFormatter(logging.Formatter\
746
('%(levelname)s: %(message)s'))
747
logger.addHandler(console)
751
def remove_from_clients(client):
752
clients.remove(client)
754
logger.debug(u"No clients left, exiting")
757
clients.update(Set(Client(name=section,
758
stop_hook = remove_from_clients,
759
**(dict(client_config\
761
for section in client_config.sections()))
767
"Cleanup function; run on exit"
769
# From the Avahi example code
770
if not group is None:
773
# End of Avahi example code
776
client = clients.pop()
777
client.stop_hook = None
780
atexit.register(cleanup)
2306
pidfile.write(str(pid) + "\n".encode("utf-8"))
2309
logger.error("Could not write to file %r with PID %d",
2312
# "pidfile" was never created
2315
783
signal.signal(signal.SIGINT, signal.SIG_IGN)
2317
784
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2318
785
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2321
class MandosDBusService(dbus.service.Object):
2322
"""A D-Bus proxy object"""
2324
dbus.service.Object.__init__(self, bus, "/")
2325
_interface = "se.recompile.Mandos"
2327
@dbus.service.signal(_interface, signature="o")
2328
def ClientAdded(self, objpath):
2332
@dbus.service.signal(_interface, signature="ss")
2333
def ClientNotFound(self, fingerprint, address):
2337
@dbus.service.signal(_interface, signature="os")
2338
def ClientRemoved(self, objpath, name):
2342
@dbus.service.method(_interface, out_signature="ao")
2343
def GetAllClients(self):
2345
return dbus.Array(c.dbus_object_path
2347
tcp_server.clients.itervalues())
2349
@dbus.service.method(_interface,
2350
out_signature="a{oa{sv}}")
2351
def GetAllClientsWithProperties(self):
2353
return dbus.Dictionary(
2354
((c.dbus_object_path, c.GetAll(""))
2355
for c in tcp_server.clients.itervalues()),
2358
@dbus.service.method(_interface, in_signature="o")
2359
def RemoveClient(self, object_path):
2361
for c in tcp_server.clients.itervalues():
2362
if c.dbus_object_path == object_path:
2363
del tcp_server.clients[c.name]
2364
c.remove_from_connection()
2365
# Don't signal anything except ClientRemoved
2366
c.disable(quiet=True)
2368
self.ClientRemoved(object_path, c.name)
2370
raise KeyError(object_path)
2374
class MandosDBusServiceTransitional(MandosDBusService):
2375
__metaclass__ = AlternateDBusNamesMetaclass
2376
mandos_dbus_service = MandosDBusServiceTransitional()
2379
"Cleanup function; run on exit"
2382
multiprocessing.active_children()
2383
if not (tcp_server.clients or client_settings):
2386
# Store client before exiting. Secrets are encrypted with key
2387
# based on what config file has. If config file is
2388
# removed/edited, old secret will thus be unrecovable.
2390
with PGPEngine() as pgp:
2391
for client in tcp_server.clients.itervalues():
2392
key = client_settings[client.name]["secret"]
2393
client.encrypted_secret = pgp.encrypt(client.secret,
2397
# A list of attributes that can not be pickled
2399
exclude = set(("bus", "changedstate", "secret",
2401
for name, typ in (inspect.getmembers
2402
(dbus.service.Object)):
2405
client_dict["encrypted_secret"] = (client
2407
for attr in client.client_structure:
2408
if attr not in exclude:
2409
client_dict[attr] = getattr(client, attr)
2411
clients[client.name] = client_dict
2412
del client_settings[client.name]["secret"]
2415
tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
2418
(stored_state_path))
2419
with os.fdopen(tempfd, "wb") as stored_state:
2420
pickle.dump((clients, client_settings), stored_state)
2421
os.rename(tempname, stored_state_path)
2422
except (IOError, OSError) as e:
2423
logger.warning("Could not save persistent state: {0}"
2430
if e.errno not in set((errno.ENOENT, errno.EACCES,
2434
# Delete all clients, and settings from config
2435
while tcp_server.clients:
2436
name, client = tcp_server.clients.popitem()
2438
client.remove_from_connection()
2439
# Don't signal anything except ClientRemoved
2440
client.disable(quiet=True)
2443
mandos_dbus_service.ClientRemoved(client
2446
client_settings.clear()
2448
atexit.register(cleanup)
2450
for client in tcp_server.clients.itervalues():
2453
mandos_dbus_service.ClientAdded(client.dbus_object_path)
2454
# Need to initiate checking of clients
2456
client.init_checker()
2459
tcp_server.server_activate()
787
for client in clients:
790
tcp_server = IPv6_TCPServer((server_settings["address"],
791
server_settings["port"]),
793
settings=server_settings,
2461
795
# Find out what port we got
2462
796
service.port = tcp_server.socket.getsockname()[1]
2464
logger.info("Now listening on address %r, port %d,"
2465
" flowinfo %d, scope_id %d"
2466
% tcp_server.socket.getsockname())
2468
logger.info("Now listening on address %r, port %d"
2469
% tcp_server.socket.getsockname())
797
logger.debug(u"Now listening on address %r, port %d, flowinfo %d,"
798
u" scope_id %d" % tcp_server.socket.getsockname())
2471
800
#service.interface = tcp_server.socket.getsockname()[3]
2474
803
# From the Avahi example code
804
server.connect_to_signal("StateChanged", server_state_changed)
2477
except dbus.exceptions.DBusException as error:
2478
logger.critical("DBusException: %s", error)
806
server_state_changed(server.GetState())
807
except dbus.exceptions.DBusException, error:
808
logger.critical(u"DBusException: %s", error)
2481
810
# End of Avahi example code
2483
812
gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2484
813
lambda *args, **kwargs:
2485
(tcp_server.handle_request
2486
(*args[2:], **kwargs) or True))
814
tcp_server.handle_request\
815
(*args[2:], **kwargs) or True)
2488
817
logger.debug("Starting main loop")
818
main_loop_started = True
2490
except AvahiError as error:
2491
logger.critical("AvahiError: %s", error)
820
except AvahiError, error:
821
logger.critical(u"AvahiError: %s" + unicode(error))
2494
823
except KeyboardInterrupt:
2496
print("", file=sys.stderr)
2497
logger.debug("Server received KeyboardInterrupt")
2498
logger.debug("Server exiting")
2499
# Must run before the D-Bus bus name gets deregistered
2502
827
if __name__ == '__main__':