88
81
except ImportError:
89
82
SO_BINDTODEVICE = None
91
if sys.version_info.major == 2:
95
stored_state_file = "clients.pickle"
97
logger = logging.getLogger()
101
if_nametoindex = ctypes.cdll.LoadLibrary(
102
ctypes.util.find_library("c")).if_nametoindex
103
except (OSError, AttributeError):
105
def if_nametoindex(interface):
106
"Get an interface index the hard way, i.e. using fcntl()"
107
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
108
with contextlib.closing(socket.socket()) as s:
109
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
110
struct.pack(b"16s16x", interface))
111
interface_index = struct.unpack("I", ifreq[16:20])[0]
112
return interface_index
115
def initlogger(debug, level=logging.WARNING):
116
"""init logger and add loglevel"""
119
syslogger = (logging.handlers.SysLogHandler(
120
facility = logging.handlers.SysLogHandler.LOG_DAEMON,
121
address = "/dev/log"))
122
syslogger.setFormatter(logging.Formatter
123
('Mandos [%(process)d]: %(levelname)s:'
125
logger.addHandler(syslogger)
128
console = logging.StreamHandler()
129
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
133
logger.addHandler(console)
134
logger.setLevel(level)
137
class PGPError(Exception):
138
"""Exception if encryption/decryption fails"""
142
class PGPEngine(object):
143
"""A simple class for OpenPGP symmetric encryption & decryption"""
146
self.tempdir = tempfile.mkdtemp(prefix="mandos-")
147
self.gnupgargs = ['--batch',
148
'--home', self.tempdir,
156
def __exit__(self, exc_type, exc_value, traceback):
164
if self.tempdir is not None:
165
# Delete contents of tempdir
166
for root, dirs, files in os.walk(self.tempdir,
168
for filename in files:
169
os.remove(os.path.join(root, filename))
171
os.rmdir(os.path.join(root, dirname))
173
os.rmdir(self.tempdir)
176
def password_encode(self, password):
177
# Passphrase can not be empty and can not contain newlines or
178
# NUL bytes. So we prefix it and hex encode it.
179
encoded = b"mandos" + binascii.hexlify(password)
180
if len(encoded) > 2048:
181
# GnuPG can't handle long passwords, so encode differently
182
encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
183
.replace(b"\n", b"\\n")
184
.replace(b"\0", b"\\x00"))
187
def encrypt(self, data, password):
188
passphrase = self.password_encode(password)
189
with tempfile.NamedTemporaryFile(
190
dir=self.tempdir) as passfile:
191
passfile.write(passphrase)
193
proc = subprocess.Popen(['gpg', '--symmetric',
197
stdin = subprocess.PIPE,
198
stdout = subprocess.PIPE,
199
stderr = subprocess.PIPE)
200
ciphertext, err = proc.communicate(input = data)
201
if proc.returncode != 0:
205
def decrypt(self, data, password):
206
passphrase = self.password_encode(password)
207
with tempfile.NamedTemporaryFile(
208
dir = self.tempdir) as passfile:
209
passfile.write(passphrase)
211
proc = subprocess.Popen(['gpg', '--decrypt',
215
stdin = subprocess.PIPE,
216
stdout = subprocess.PIPE,
217
stderr = subprocess.PIPE)
218
decrypted_plaintext, err = proc.communicate(input = data)
219
if proc.returncode != 0:
221
return decrypted_plaintext
87
#logger = logging.getLogger('mandos')
88
logger = logging.Logger('mandos')
89
syslogger = (logging.handlers.SysLogHandler
90
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
91
address = str("/dev/log")))
92
syslogger.setFormatter(logging.Formatter
93
('Mandos [%(process)d]: %(levelname)s:'
95
logger.addHandler(syslogger)
97
console = logging.StreamHandler()
98
console.setFormatter(logging.Formatter('%(name)s [%(process)d]:'
101
logger.addHandler(console)
224
103
class AvahiError(Exception):
225
104
def __init__(self, value, *args, **kwargs):
226
105
self.value = value
227
return super(AvahiError, self).__init__(value, *args,
106
super(AvahiError, self).__init__(value, *args, **kwargs)
107
def __unicode__(self):
108
return unicode(repr(self.value))
231
110
class AvahiServiceError(AvahiError):
235
113
class AvahiGroupError(AvahiError):
282
152
self.server = None
284
154
self.entry_group_state_changed_match = None
286
def rename(self, remove=True):
287
156
"""Derived from the Avahi example code"""
288
157
if self.rename_count >= self.max_renames:
289
158
logger.critical("No suitable Zeroconf service name found"
290
159
" after %i retries, exiting.",
291
160
self.rename_count)
292
161
raise AvahiServiceError("Too many renames")
294
self.server.GetAlternativeServiceName(self.name))
295
self.rename_count += 1
162
self.name = unicode(self.server.GetAlternativeServiceName(self.name))
296
163
logger.info("Changing Zeroconf service name to %r ...",
165
syslogger.setFormatter(logging.Formatter
166
('Mandos (%s) [%%(process)d]:'
167
' %%(levelname)s: %%(message)s'
302
172
except dbus.exceptions.DBusException as error:
303
if (error.get_dbus_name()
304
== "org.freedesktop.Avahi.CollisionError"):
305
logger.info("Local Zeroconf service name collision.")
306
return self.rename(remove=False)
308
logger.critical("D-Bus Exception", exc_info=error)
173
logger.critical("DBusException: %s", error)
176
self.rename_count += 1
312
177
def remove(self):
313
178
"""Derived from the Avahi example code"""
179
if self.group is not None:
182
except (dbus.exceptions.UnknownMethodException,
183
dbus.exceptions.DBusException) as e:
314
186
if self.entry_group_state_changed_match is not None:
315
187
self.entry_group_state_changed_match.remove()
316
188
self.entry_group_state_changed_match = None
317
if self.group is not None:
321
190
"""Derived from the Avahi example code"""
323
if self.group is None:
324
self.group = dbus.Interface(
325
self.bus.get_object(avahi.DBUS_NAME,
326
self.server.EntryGroupNew()),
327
avahi.DBUS_INTERFACE_ENTRY_GROUP)
192
self.group = dbus.Interface(
193
self.bus.get_object(avahi.DBUS_NAME,
194
self.server.EntryGroupNew(),
195
follow_name_owner_changes=True),
196
avahi.DBUS_INTERFACE_ENTRY_GROUP)
328
197
self.entry_group_state_changed_match = (
329
198
self.group.connect_to_signal(
330
'StateChanged', self.entry_group_state_changed))
199
'StateChanged', self .entry_group_state_changed))
331
200
logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
332
201
self.name, self.type)
333
202
self.group.AddService(
440
283
interval: datetime.timedelta(); How often to start a new checker
441
284
last_approval_request: datetime.datetime(); (UTC) or None
442
285
last_checked_ok: datetime.datetime(); (UTC) or None
443
last_checker_status: integer between 0 and 255 reflecting exit
444
status of last checker. -1 reflects crashed
445
checker, -2 means no checker completed yet.
446
last_enabled: datetime.datetime(); (UTC) or None
286
last_enabled: datetime.datetime(); (UTC)
447
287
name: string; from the config file, used in log messages and
448
288
D-Bus identifiers
449
289
secret: bytestring; sent verbatim (over TLS) to client
450
290
timeout: datetime.timedelta(); How long from last_checked_ok
451
291
until this client is disabled
452
extended_timeout: extra long timeout when secret has been sent
453
292
runtime_expansions: Allowed attributes for runtime expansion.
454
expires: datetime.datetime(); time (UTC) when a client will be
456
server_settings: The server_settings dict from main()
459
295
runtime_expansions = ("approval_delay", "approval_duration",
460
"created", "enabled", "expires",
461
"fingerprint", "host", "interval",
462
"last_approval_request", "last_checked_ok",
296
"created", "enabled", "fingerprint",
297
"host", "interval", "last_checked_ok",
463
298
"last_enabled", "name", "timeout")
466
"extended_timeout": "PT15M",
468
"checker": "fping -q -- %%(host)s",
470
"approval_delay": "PT0S",
471
"approval_duration": "PT1S",
472
"approved_by_default": "True",
477
def config_parser(config):
478
"""Construct a new dict of client settings of this form:
479
{ client_name: {setting_name: value, ...}, ...}
480
with exceptions for any special settings as defined above.
481
NOTE: Must be a pure function. Must return the same result
482
value given the same arguments.
485
for client_name in config.sections():
486
section = dict(config.items(client_name))
487
client = settings[client_name] = {}
489
client["host"] = section["host"]
490
# Reformat values from string types to Python types
491
client["approved_by_default"] = config.getboolean(
492
client_name, "approved_by_default")
493
client["enabled"] = config.getboolean(client_name,
496
# Uppercase and remove spaces from fingerprint for later
497
# comparison purposes with return value from the
498
# fingerprint() function
499
client["fingerprint"] = (section["fingerprint"].upper()
501
if "secret" in section:
502
client["secret"] = section["secret"].decode("base64")
503
elif "secfile" in section:
504
with open(os.path.expanduser(os.path.expandvars
505
(section["secfile"])),
507
client["secret"] = secfile.read()
509
raise TypeError("No secret or secfile for section {}"
511
client["timeout"] = string_to_delta(section["timeout"])
512
client["extended_timeout"] = string_to_delta(
513
section["extended_timeout"])
514
client["interval"] = string_to_delta(section["interval"])
515
client["approval_delay"] = string_to_delta(
516
section["approval_delay"])
517
client["approval_duration"] = string_to_delta(
518
section["approval_duration"])
519
client["checker_command"] = section["checker"]
520
client["last_approval_request"] = None
521
client["last_checked_ok"] = None
522
client["last_checker_status"] = -2
526
def __init__(self, settings, name = None, server_settings=None):
301
def _timedelta_to_milliseconds(td):
302
"Convert a datetime.timedelta() to milliseconds"
303
return ((td.days * 24 * 60 * 60 * 1000)
304
+ (td.seconds * 1000)
305
+ (td.microseconds // 1000))
307
def timeout_milliseconds(self):
308
"Return the 'timeout' attribute in milliseconds"
309
return self._timedelta_to_milliseconds(self.timeout)
311
def interval_milliseconds(self):
312
"Return the 'interval' attribute in milliseconds"
313
return self._timedelta_to_milliseconds(self.interval)
315
def approval_delay_milliseconds(self):
316
return self._timedelta_to_milliseconds(self.approval_delay)
318
def __init__(self, name = None, disable_hook=None, config=None):
319
"""Note: the 'checker' key in 'config' sets the
320
'checker_command' attribute and *not* the 'checker'
528
if server_settings is None:
530
self.server_settings = server_settings
531
# adding all client settings
532
for setting, value in settings.items():
533
setattr(self, setting, value)
536
if not hasattr(self, "last_enabled"):
537
self.last_enabled = datetime.datetime.utcnow()
538
if not hasattr(self, "expires"):
539
self.expires = (datetime.datetime.utcnow()
542
self.last_enabled = None
545
325
logger.debug("Creating client %r", self.name)
326
# Uppercase and remove spaces from fingerprint for later
327
# comparison purposes with return value from the fingerprint()
329
self.fingerprint = (config["fingerprint"].upper()
546
331
logger.debug(" Fingerprint: %s", self.fingerprint)
547
self.created = settings.get("created",
548
datetime.datetime.utcnow())
550
# attributes specific for this server instance
332
if "secret" in config:
333
self.secret = config["secret"].decode("base64")
334
elif "secfile" in config:
335
with open(os.path.expanduser(os.path.expandvars
336
(config["secfile"])),
338
self.secret = secfile.read()
340
raise TypeError("No secret or secfile for client %s"
342
self.host = config.get("host", "")
343
self.created = datetime.datetime.utcnow()
345
self.last_approval_request = None
346
self.last_enabled = None
347
self.last_checked_ok = None
348
self.timeout = string_to_delta(config["timeout"])
349
self.interval = string_to_delta(config["interval"])
350
self.disable_hook = disable_hook
551
351
self.checker = None
552
352
self.checker_initiator_tag = None
553
353
self.disable_initiator_tag = None
554
354
self.checker_callback_tag = None
355
self.checker_command = config["checker"]
555
356
self.current_checker_command = None
357
self.last_connect = None
358
self._approved = None
359
self.approved_by_default = config.get("approved_by_default",
557
361
self.approvals_pending = 0
558
self.changedstate = multiprocessing_manager.Condition(
559
multiprocessing_manager.Lock())
560
self.client_structure = [attr
561
for attr in self.__dict__.iterkeys()
562
if not attr.startswith("_")]
563
self.client_structure.append("client_structure")
565
for name, t in inspect.getmembers(
566
type(self), lambda obj: isinstance(obj, property)):
567
if not name.startswith("_"):
568
self.client_structure.append(name)
362
self.approval_delay = string_to_delta(
363
config["approval_delay"])
364
self.approval_duration = string_to_delta(
365
config["approval_duration"])
366
self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
570
# Send notice to process children that client state has changed
571
368
def send_changedstate(self):
572
with self.changedstate:
573
self.changedstate.notify_all()
369
self.changedstate.acquire()
370
self.changedstate.notify_all()
371
self.changedstate.release()
575
373
def enable(self):
576
374
"""Start this client's checker and timeout hooks"""
577
375
if getattr(self, "enabled", False):
578
376
# Already enabled
580
self.expires = datetime.datetime.utcnow() + self.timeout
378
self.send_changedstate()
582
379
self.last_enabled = datetime.datetime.utcnow()
584
self.send_changedstate()
380
# Schedule a new checker to be started an 'interval' from now,
381
# and every interval from then on.
382
self.checker_initiator_tag = (gobject.timeout_add
383
(self.interval_milliseconds(),
385
# Schedule a disable() when 'timeout' has passed
386
self.disable_initiator_tag = (gobject.timeout_add
387
(self.timeout_milliseconds(),
390
# Also start a new checker *right now*.
586
393
def disable(self, quiet=True):
587
394
"""Disable this client."""
588
395
if not getattr(self, "enabled", False):
398
self.send_changedstate()
591
400
logger.info("Disabling client %s", self.name)
592
if getattr(self, "disable_initiator_tag", None) is not None:
401
if getattr(self, "disable_initiator_tag", False):
593
402
gobject.source_remove(self.disable_initiator_tag)
594
403
self.disable_initiator_tag = None
596
if getattr(self, "checker_initiator_tag", None) is not None:
404
if getattr(self, "checker_initiator_tag", False):
597
405
gobject.source_remove(self.checker_initiator_tag)
598
406
self.checker_initiator_tag = None
599
407
self.stop_checker()
408
if self.disable_hook:
409
self.disable_hook(self)
600
410
self.enabled = False
602
self.send_changedstate()
603
411
# Do not run this again if called by a gobject.timeout_add
606
414
def __del__(self):
415
self.disable_hook = None
609
def init_checker(self):
610
# Schedule a new checker to be started an 'interval' from now,
611
# and every interval from then on.
612
if self.checker_initiator_tag is not None:
613
gobject.source_remove(self.checker_initiator_tag)
614
self.checker_initiator_tag = gobject.timeout_add(
615
int(self.interval.total_seconds() * 1000),
617
# Schedule a disable() when 'timeout' has passed
618
if self.disable_initiator_tag is not None:
619
gobject.source_remove(self.disable_initiator_tag)
620
self.disable_initiator_tag = gobject.timeout_add(
621
int(self.timeout.total_seconds() * 1000), self.disable)
622
# Also start a new checker *right now*.
625
418
def checker_callback(self, pid, condition, command):
626
419
"""The checker has completed, so take appropriate actions."""
627
420
self.checker_callback_tag = None
628
421
self.checker = None
629
422
if os.WIFEXITED(condition):
630
self.last_checker_status = os.WEXITSTATUS(condition)
631
if self.last_checker_status == 0:
423
exitstatus = os.WEXITSTATUS(condition)
632
425
logger.info("Checker for %(name)s succeeded",
634
427
self.checked_ok()
636
logger.info("Checker for %(name)s failed", vars(self))
429
logger.info("Checker for %(name)s failed",
638
self.last_checker_status = -1
639
432
logger.warning("Checker for %(name)s crashed?",
642
435
def checked_ok(self):
643
"""Assert that the client has been seen, alive and well."""
436
"""Bump up the timeout for this client.
438
This should only be called when the client has been seen,
644
441
self.last_checked_ok = datetime.datetime.utcnow()
645
self.last_checker_status = 0
648
def bump_timeout(self, timeout=None):
649
"""Bump up the timeout for this client."""
651
timeout = self.timeout
652
if self.disable_initiator_tag is not None:
653
gobject.source_remove(self.disable_initiator_tag)
654
self.disable_initiator_tag = None
655
if getattr(self, "enabled", False):
656
self.disable_initiator_tag = gobject.timeout_add(
657
int(timeout.total_seconds() * 1000), self.disable)
658
self.expires = datetime.datetime.utcnow() + timeout
442
gobject.source_remove(self.disable_initiator_tag)
443
self.disable_initiator_tag = (gobject.timeout_add
444
(self.timeout_milliseconds(),
660
447
def need_approval(self):
661
448
self.last_approval_request = datetime.datetime.utcnow()
690
476
self.current_checker_command)
691
477
# Start a new checker if needed
692
478
if self.checker is None:
693
# Escape attributes for the shell
695
attr: re.escape(str(getattr(self, attr)))
696
for attr in self.runtime_expansions }
698
command = self.checker_command % escaped_attrs
699
except TypeError as error:
700
logger.error('Could not format string "%s"',
701
self.checker_command,
703
return True # Try again later
480
# In case checker_command has exactly one % operator
481
command = self.checker_command % self.host
483
# Escape attributes for the shell
484
escaped_attrs = dict(
486
re.escape(unicode(str(getattr(self, attr, "")),
490
self.runtime_expansions)
493
command = self.checker_command % escaped_attrs
494
except TypeError as error:
495
logger.error('Could not format string "%s":'
496
' %s', self.checker_command, error)
497
return True # Try again later
704
498
self.current_checker_command = command
706
logger.info("Starting checker %r for %s", command,
500
logger.info("Starting checker %r for %s",
708
502
# We don't need to redirect stdout and stderr, since
709
503
# in normal mode, that is already done by daemon(),
710
504
# and in debug mode we don't want to. (Stdin is
711
505
# always replaced by /dev/null.)
712
# The exception is when not debugging but nevertheless
713
# running in the foreground; use the previously
716
if (not self.server_settings["debug"]
717
and self.server_settings["foreground"]):
718
popen_args.update({"stdout": wnull,
720
506
self.checker = subprocess.Popen(command,
725
except OSError as error:
726
logger.error("Failed to start subprocess",
729
self.checker_callback_tag = gobject.child_watch_add(
730
self.checker.pid, self.checker_callback, data=command)
731
# The checker may have completed before the gobject
732
# watch was added. Check for this.
509
self.checker_callback_tag = (gobject.child_watch_add
511
self.checker_callback,
513
# The checker may have completed before the gobject
514
# watch was added. Check for this.
734
515
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
517
gobject.source_remove(self.checker_callback_tag)
518
self.checker_callback(pid, status, command)
735
519
except OSError as error:
736
if error.errno == errno.ECHILD:
737
# This should never happen
738
logger.error("Child process vanished",
743
gobject.source_remove(self.checker_callback_tag)
744
self.checker_callback(pid, status, command)
520
logger.error("Failed to start subprocess: %s",
745
522
# Re-run this periodically if run by gobject.timeout_add
860
592
class DBusObjectWithProperties(dbus.service.Object):
861
593
"""A D-Bus object with properties.
863
595
Classes inheriting from this can use the dbus_service_property
864
596
decorator to expose methods as D-Bus properties. It exposes the
865
597
standard Get(), Set(), and GetAll() methods on the D-Bus.
869
def _is_dbus_thing(thing):
870
"""Returns a function testing if an attribute is a D-Bus thing
872
If called like _is_dbus_thing("method") it returns a function
873
suitable for use as predicate to inspect.getmembers().
875
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
601
def _is_dbus_property(obj):
602
return getattr(obj, "_dbus_is_property", False)
878
def _get_all_dbus_things(self, thing):
604
def _get_all_dbus_properties(self):
879
605
"""Returns a generator of (name, attribute) pairs
881
return ((getattr(athing.__get__(self), "_dbus_name", name),
882
athing.__get__(self))
883
for cls in self.__class__.__mro__
885
inspect.getmembers(cls, self._is_dbus_thing(thing)))
607
return ((prop._dbus_name, prop)
609
inspect.getmembers(self, self._is_dbus_property))
887
611
def _get_dbus_property(self, interface_name, property_name):
888
612
"""Returns a bound method if one exists which is a D-Bus
889
613
property with the specified name and interface.
891
for cls in self.__class__.__mro__:
892
for name, value in inspect.getmembers(
893
cls, self._is_dbus_thing("property")):
894
if (value._dbus_name == property_name
895
and value._dbus_interface == interface_name):
896
return value.__get__(self)
615
for name in (property_name,
616
property_name + "_dbus_property"):
617
prop = getattr(self, name, None)
619
or not self._is_dbus_property(prop)
620
or prop._dbus_name != property_name
621
or (interface_name and prop._dbus_interface
622
and interface_name != prop._dbus_interface)):
898
625
# No such property
899
raise DBusPropertyNotFound("{}:{}.{}".format(
900
self.dbus_object_path, interface_name, property_name))
626
raise DBusPropertyNotFound(self.dbus_object_path + ":"
627
+ interface_name + "."
902
@dbus.service.method(dbus.PROPERTIES_IFACE,
630
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
904
631
out_signature="v")
905
632
def Get(self, interface_name, property_name):
906
633
"""Standard D-Bus property Get() method, see D-Bus standard.
953
677
if not hasattr(value, "variant_level"):
954
properties[name] = value
956
properties[name] = type(value)(
957
value, variant_level = value.variant_level + 1)
958
return dbus.Dictionary(properties, signature="sv")
960
@dbus.service.signal(dbus.PROPERTIES_IFACE, signature="sa{sv}as")
961
def PropertiesChanged(self, interface_name, changed_properties,
962
invalidated_properties):
963
"""Standard D-Bus PropertiesChanged() signal, see D-Bus
680
all[name] = type(value)(value, variant_level=
681
value.variant_level+1)
682
return dbus.Dictionary(all, signature="sv")
968
684
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
969
685
out_signature="s",
970
686
path_keyword='object_path',
971
687
connection_keyword='connection')
972
688
def Introspect(self, object_path, connection):
973
"""Overloading of standard D-Bus method.
975
Inserts property tags and interface annotation tags.
689
"""Standard D-Bus method, overloaded to insert property tags.
977
691
xmlstring = dbus.service.Object.Introspect(self, object_path,
980
694
document = xml.dom.minidom.parseString(xmlstring)
982
695
def make_tag(document, name, prop):
983
696
e = document.createElement("property")
984
697
e.setAttribute("name", name)
985
698
e.setAttribute("type", prop._dbus_signature)
986
699
e.setAttribute("access", prop._dbus_access)
989
701
for if_tag in document.getElementsByTagName("interface"):
991
702
for tag in (make_tag(document, name, prop)
993
in self._get_all_dbus_things("property")
704
in self._get_all_dbus_properties()
994
705
if prop._dbus_interface
995
706
== if_tag.getAttribute("name")):
996
707
if_tag.appendChild(tag)
997
# Add annotation tags
998
for typ in ("method", "signal", "property"):
999
for tag in if_tag.getElementsByTagName(typ):
1001
for name, prop in (self.
1002
_get_all_dbus_things(typ)):
1003
if (name == tag.getAttribute("name")
1004
and prop._dbus_interface
1005
== if_tag.getAttribute("name")):
1006
annots.update(getattr(
1007
prop, "_dbus_annotations", {}))
1008
for name, value in annots.items():
1009
ann_tag = document.createElement(
1011
ann_tag.setAttribute("name", name)
1012
ann_tag.setAttribute("value", value)
1013
tag.appendChild(ann_tag)
1014
# Add interface annotation tags
1015
for annotation, value in dict(
1016
itertools.chain.from_iterable(
1017
annotations().items()
1018
for name, annotations
1019
in self._get_all_dbus_things("interface")
1020
if name == if_tag.getAttribute("name")
1022
ann_tag = document.createElement("annotation")
1023
ann_tag.setAttribute("name", annotation)
1024
ann_tag.setAttribute("value", value)
1025
if_tag.appendChild(ann_tag)
1026
708
# Add the names to the return values for the
1027
709
# "org.freedesktop.DBus.Properties" methods
1028
710
if (if_tag.getAttribute("name")
1043
725
except (AttributeError, xml.dom.DOMException,
1044
726
xml.parsers.expat.ExpatError) as error:
1045
727
logger.error("Failed to override Introspection method",
1047
729
return xmlstring
1050
def datetime_to_dbus(dt, variant_level=0):
1051
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1053
return dbus.String("", variant_level = variant_level)
1054
return dbus.String(dt.isoformat(), variant_level=variant_level)
1057
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1058
"""A class decorator; applied to a subclass of
1059
dbus.service.Object, it will add alternate D-Bus attributes with
1060
interface names according to the "alt_interface_names" mapping.
1063
@alternate_dbus_interfaces({"org.example.Interface":
1064
"net.example.AlternateInterface"})
1065
class SampleDBusObject(dbus.service.Object):
1066
@dbus.service.method("org.example.Interface")
1067
def SampleDBusMethod():
1070
The above "SampleDBusMethod" on "SampleDBusObject" will be
1071
reachable via two interfaces: "org.example.Interface" and
1072
"net.example.AlternateInterface", the latter of which will have
1073
its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
1074
"true", unless "deprecate" is passed with a False value.
1076
This works for methods and signals, and also for D-Bus properties
1077
(from DBusObjectWithProperties) and interfaces (from the
1078
dbus_interface_annotations decorator).
1082
for orig_interface_name, alt_interface_name in (
1083
alt_interface_names.items()):
1085
interface_names = set()
1086
# Go though all attributes of the class
1087
for attrname, attribute in inspect.getmembers(cls):
1088
# Ignore non-D-Bus attributes, and D-Bus attributes
1089
# with the wrong interface name
1090
if (not hasattr(attribute, "_dbus_interface")
1091
or not attribute._dbus_interface.startswith(
1092
orig_interface_name)):
1094
# Create an alternate D-Bus interface name based on
1096
alt_interface = attribute._dbus_interface.replace(
1097
orig_interface_name, alt_interface_name)
1098
interface_names.add(alt_interface)
1099
# Is this a D-Bus signal?
1100
if getattr(attribute, "_dbus_is_signal", False):
1101
# Extract the original non-method undecorated
1102
# function by black magic
1103
nonmethod_func = (dict(
1104
zip(attribute.func_code.co_freevars,
1105
attribute.__closure__))
1106
["func"].cell_contents)
1107
# Create a new, but exactly alike, function
1108
# object, and decorate it to be a new D-Bus signal
1109
# with the alternate D-Bus interface name
1110
new_function = (dbus.service.signal(
1111
alt_interface, attribute._dbus_signature)
1112
(types.FunctionType(
1113
nonmethod_func.func_code,
1114
nonmethod_func.func_globals,
1115
nonmethod_func.func_name,
1116
nonmethod_func.func_defaults,
1117
nonmethod_func.func_closure)))
1118
# Copy annotations, if any
1120
new_function._dbus_annotations = dict(
1121
attribute._dbus_annotations)
1122
except AttributeError:
1124
# Define a creator of a function to call both the
1125
# original and alternate functions, so both the
1126
# original and alternate signals gets sent when
1127
# the function is called
1128
def fixscope(func1, func2):
1129
"""This function is a scope container to pass
1130
func1 and func2 to the "call_both" function
1131
outside of its arguments"""
1133
def call_both(*args, **kwargs):
1134
"""This function will emit two D-Bus
1135
signals by calling func1 and func2"""
1136
func1(*args, **kwargs)
1137
func2(*args, **kwargs)
1140
# Create the "call_both" function and add it to
1142
attr[attrname] = fixscope(attribute, new_function)
1143
# Is this a D-Bus method?
1144
elif getattr(attribute, "_dbus_is_method", False):
1145
# Create a new, but exactly alike, function
1146
# object. Decorate it to be a new D-Bus method
1147
# with the alternate D-Bus interface name. Add it
1150
dbus.service.method(
1152
attribute._dbus_in_signature,
1153
attribute._dbus_out_signature)
1154
(types.FunctionType(attribute.func_code,
1155
attribute.func_globals,
1156
attribute.func_name,
1157
attribute.func_defaults,
1158
attribute.func_closure)))
1159
# Copy annotations, if any
1161
attr[attrname]._dbus_annotations = dict(
1162
attribute._dbus_annotations)
1163
except AttributeError:
1165
# Is this a D-Bus property?
1166
elif getattr(attribute, "_dbus_is_property", False):
1167
# Create a new, but exactly alike, function
1168
# object, and decorate it to be a new D-Bus
1169
# property with the alternate D-Bus interface
1170
# name. Add it to the class.
1171
attr[attrname] = (dbus_service_property(
1172
alt_interface, attribute._dbus_signature,
1173
attribute._dbus_access,
1174
attribute._dbus_get_args_options
1176
(types.FunctionType(
1177
attribute.func_code,
1178
attribute.func_globals,
1179
attribute.func_name,
1180
attribute.func_defaults,
1181
attribute.func_closure)))
1182
# Copy annotations, if any
1184
attr[attrname]._dbus_annotations = dict(
1185
attribute._dbus_annotations)
1186
except AttributeError:
1188
# Is this a D-Bus interface?
1189
elif getattr(attribute, "_dbus_is_interface", False):
1190
# Create a new, but exactly alike, function
1191
# object. Decorate it to be a new D-Bus interface
1192
# with the alternate D-Bus interface name. Add it
1195
dbus_interface_annotations(alt_interface)
1196
(types.FunctionType(attribute.func_code,
1197
attribute.func_globals,
1198
attribute.func_name,
1199
attribute.func_defaults,
1200
attribute.func_closure)))
1202
# Deprecate all alternate interfaces
1203
iname="_AlternateDBusNames_interface_annotation{}"
1204
for interface_name in interface_names:
1206
@dbus_interface_annotations(interface_name)
1208
return { "org.freedesktop.DBus.Deprecated":
1210
# Find an unused name
1211
for aname in (iname.format(i)
1212
for i in itertools.count()):
1213
if aname not in attr:
1217
# Replace the class with a new subclass of it with
1218
# methods, signals, etc. as created above.
1219
cls = type(b"{}Alternate".format(cls.__name__),
1226
@alternate_dbus_interfaces({"se.recompile.Mandos":
1227
"se.bsnet.fukt.Mandos"})
1228
732
class ClientDBus(Client, DBusObjectWithProperties):
1229
733
"""A Client class using D-Bus
1236
740
runtime_expansions = (Client.runtime_expansions
1237
+ ("dbus_object_path", ))
1239
_interface = "se.recompile.Mandos.Client"
741
+ ("dbus_object_path",))
1241
743
# dbus.service.Object doesn't use super(), so we can't either.
1243
745
def __init__(self, bus = None, *args, **kwargs):
746
self._approvals_pending = 0
1245
748
Client.__init__(self, *args, **kwargs)
1246
749
# Only now, when this client is initialized, can it show up on
1248
client_object_name = str(self.name).translate(
751
client_object_name = unicode(self.name).translate(
1249
752
{ord("."): ord("_"),
1250
753
ord("-"): ord("_")})
1251
self.dbus_object_path = dbus.ObjectPath(
1252
"/clients/" + client_object_name)
754
self.dbus_object_path = (dbus.ObjectPath
755
("/clients/" + client_object_name))
1253
756
DBusObjectWithProperties.__init__(self, self.bus,
1254
757
self.dbus_object_path)
1256
def notifychangeproperty(transform_func, dbus_name,
1257
type_func=lambda x: x,
1259
invalidate_only=False,
1260
_interface=_interface):
1261
""" Modify a variable so that it's a property which announces
1262
its changes to DBus.
1264
transform_fun: Function that takes a value and a variant_level
1265
and transforms it to a D-Bus type.
1266
dbus_name: D-Bus name of the variable
1267
type_func: Function that transform the value before sending it
1268
to the D-Bus. Default: no transform
1269
variant_level: D-Bus variant level. Default: 1
1271
attrname = "_{}".format(dbus_name)
1273
def setter(self, value):
1274
if hasattr(self, "dbus_object_path"):
1275
if (not hasattr(self, attrname) or
1276
type_func(getattr(self, attrname, None))
1277
!= type_func(value)):
1279
self.PropertiesChanged(
1280
_interface, dbus.Dictionary(),
1281
dbus.Array((dbus_name, )))
1283
dbus_value = transform_func(
1285
variant_level = variant_level)
1286
self.PropertyChanged(dbus.String(dbus_name),
1288
self.PropertiesChanged(
1290
dbus.Dictionary({ dbus.String(dbus_name):
1293
setattr(self, attrname, value)
1295
return property(lambda self: getattr(self, attrname), setter)
1297
expires = notifychangeproperty(datetime_to_dbus, "Expires")
1298
approvals_pending = notifychangeproperty(dbus.Boolean,
1301
enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1302
last_enabled = notifychangeproperty(datetime_to_dbus,
1304
checker = notifychangeproperty(
1305
dbus.Boolean, "CheckerRunning",
1306
type_func = lambda checker: checker is not None)
1307
last_checked_ok = notifychangeproperty(datetime_to_dbus,
1309
last_checker_status = notifychangeproperty(dbus.Int16,
1310
"LastCheckerStatus")
1311
last_approval_request = notifychangeproperty(
1312
datetime_to_dbus, "LastApprovalRequest")
1313
approved_by_default = notifychangeproperty(dbus.Boolean,
1314
"ApprovedByDefault")
1315
approval_delay = notifychangeproperty(
1316
dbus.UInt64, "ApprovalDelay",
1317
type_func = lambda td: td.total_seconds() * 1000)
1318
approval_duration = notifychangeproperty(
1319
dbus.UInt64, "ApprovalDuration",
1320
type_func = lambda td: td.total_seconds() * 1000)
1321
host = notifychangeproperty(dbus.String, "Host")
1322
timeout = notifychangeproperty(
1323
dbus.UInt64, "Timeout",
1324
type_func = lambda td: td.total_seconds() * 1000)
1325
extended_timeout = notifychangeproperty(
1326
dbus.UInt64, "ExtendedTimeout",
1327
type_func = lambda td: td.total_seconds() * 1000)
1328
interval = notifychangeproperty(
1329
dbus.UInt64, "Interval",
1330
type_func = lambda td: td.total_seconds() * 1000)
1331
checker_command = notifychangeproperty(dbus.String, "Checker")
1332
secret = notifychangeproperty(dbus.ByteArray, "Secret",
1333
invalidate_only=True)
1335
del notifychangeproperty
759
def _get_approvals_pending(self):
760
return self._approvals_pending
761
def _set_approvals_pending(self, value):
762
old_value = self._approvals_pending
763
self._approvals_pending = value
765
if (hasattr(self, "dbus_object_path")
766
and bval is not bool(old_value)):
767
dbus_bool = dbus.Boolean(bval, variant_level=1)
768
self.PropertyChanged(dbus.String("ApprovalPending"),
771
approvals_pending = property(_get_approvals_pending,
772
_set_approvals_pending)
773
del _get_approvals_pending, _set_approvals_pending
776
def _datetime_to_dbus(dt, variant_level=0):
777
"""Convert a UTC datetime.datetime() to a D-Bus type."""
778
return dbus.String(dt.isoformat(),
779
variant_level=variant_level)
782
oldstate = getattr(self, "enabled", False)
783
r = Client.enable(self)
784
if oldstate != self.enabled:
786
self.PropertyChanged(dbus.String("Enabled"),
787
dbus.Boolean(True, variant_level=1))
788
self.PropertyChanged(
789
dbus.String("LastEnabled"),
790
self._datetime_to_dbus(self.last_enabled,
794
def disable(self, quiet = False):
795
oldstate = getattr(self, "enabled", False)
796
r = Client.disable(self, quiet=quiet)
797
if not quiet and oldstate != self.enabled:
799
self.PropertyChanged(dbus.String("Enabled"),
800
dbus.Boolean(False, variant_level=1))
1337
803
def __del__(self, *args, **kwargs):
1362
831
return Client.checker_callback(self, pid, condition, command,
1363
832
*args, **kwargs)
834
def checked_ok(self, *args, **kwargs):
835
Client.checked_ok(self, *args, **kwargs)
837
self.PropertyChanged(
838
dbus.String("LastCheckedOK"),
839
(self._datetime_to_dbus(self.last_checked_ok,
842
def need_approval(self, *args, **kwargs):
843
r = Client.need_approval(self, *args, **kwargs)
845
self.PropertyChanged(
846
dbus.String("LastApprovalRequest"),
847
(self._datetime_to_dbus(self.last_approval_request,
1365
851
def start_checker(self, *args, **kwargs):
1366
old_checker_pid = getattr(self.checker, "pid", None)
852
old_checker = self.checker
853
if self.checker is not None:
854
old_checker_pid = self.checker.pid
856
old_checker_pid = None
1367
857
r = Client.start_checker(self, *args, **kwargs)
1368
858
# Only if new checker process was started
1369
859
if (self.checker is not None
1370
860
and old_checker_pid != self.checker.pid):
1371
861
# Emit D-Bus signal
1372
862
self.CheckerStarted(self.current_checker_command)
863
self.PropertyChanged(
864
dbus.String("CheckerRunning"),
865
dbus.Boolean(True, variant_level=1))
868
def stop_checker(self, *args, **kwargs):
869
old_checker = getattr(self, "checker", None)
870
r = Client.stop_checker(self, *args, **kwargs)
871
if (old_checker is not None
872
and getattr(self, "checker", None) is None):
873
self.PropertyChanged(dbus.String("CheckerRunning"),
874
dbus.Boolean(False, variant_level=1))
1375
877
def _reset_approved(self):
1376
self.approved = None
878
self._approved = None
1379
881
def approve(self, value=True):
1380
self.approved = value
1381
gobject.timeout_add(int(self.approval_duration.total_seconds()
1382
* 1000), self._reset_approved)
1383
882
self.send_changedstate()
883
self._approved = value
884
gobject.timeout_add(self._timedelta_to_milliseconds
885
(self.approval_duration),
886
self._reset_approved)
1385
889
## D-Bus methods, signals & properties
890
_interface = "se.bsnet.fukt.Mandos.Client"
1543
1053
# LastCheckedOK - property
1544
@dbus_service_property(_interface,
1054
@dbus_service_property(_interface, signature="s",
1546
1055
access="readwrite")
1547
1056
def LastCheckedOK_dbus_property(self, value=None):
1548
1057
if value is not None:
1549
1058
self.checked_ok()
1551
return datetime_to_dbus(self.last_checked_ok)
1553
# LastCheckerStatus - property
1554
@dbus_service_property(_interface, signature="n", access="read")
1555
def LastCheckerStatus_dbus_property(self):
1556
return dbus.Int16(self.last_checker_status)
1558
# Expires - property
1559
@dbus_service_property(_interface, signature="s", access="read")
1560
def Expires_dbus_property(self):
1561
return datetime_to_dbus(self.expires)
1060
if self.last_checked_ok is None:
1061
return dbus.String("")
1062
return dbus.String(self._datetime_to_dbus(self
1563
1065
# LastApprovalRequest - property
1564
1066
@dbus_service_property(_interface, signature="s", access="read")
1565
1067
def LastApprovalRequest_dbus_property(self):
1566
return datetime_to_dbus(self.last_approval_request)
1068
if self.last_approval_request is None:
1069
return dbus.String("")
1070
return dbus.String(self.
1071
_datetime_to_dbus(self
1072
.last_approval_request))
1568
1074
# Timeout - property
1569
@dbus_service_property(_interface,
1075
@dbus_service_property(_interface, signature="t",
1571
1076
access="readwrite")
1572
1077
def Timeout_dbus_property(self, value=None):
1573
1078
if value is None: # get
1574
return dbus.UInt64(self.timeout.total_seconds() * 1000)
1575
old_timeout = self.timeout
1079
return dbus.UInt64(self.timeout_milliseconds())
1576
1080
self.timeout = datetime.timedelta(0, 0, 0, value)
1577
# Reschedule disabling
1579
now = datetime.datetime.utcnow()
1580
self.expires += self.timeout - old_timeout
1581
if self.expires <= now:
1582
# The timeout has passed
1585
if (getattr(self, "disable_initiator_tag", None)
1588
gobject.source_remove(self.disable_initiator_tag)
1589
self.disable_initiator_tag = gobject.timeout_add(
1590
int((self.expires - now).total_seconds() * 1000),
1593
# ExtendedTimeout - property
1594
@dbus_service_property(_interface,
1597
def ExtendedTimeout_dbus_property(self, value=None):
1598
if value is None: # get
1599
return dbus.UInt64(self.extended_timeout.total_seconds()
1601
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1082
self.PropertyChanged(dbus.String("Timeout"),
1083
dbus.UInt64(value, variant_level=1))
1084
if getattr(self, "disable_initiator_tag", None) is None:
1086
# Reschedule timeout
1087
gobject.source_remove(self.disable_initiator_tag)
1088
self.disable_initiator_tag = None
1089
time_to_die = (self.
1090
_timedelta_to_milliseconds((self
1095
if time_to_die <= 0:
1096
# The timeout has passed
1099
self.disable_initiator_tag = (gobject.timeout_add
1100
(time_to_die, self.disable))
1603
1102
# Interval - property
1604
@dbus_service_property(_interface,
1103
@dbus_service_property(_interface, signature="t",
1606
1104
access="readwrite")
1607
1105
def Interval_dbus_property(self, value=None):
1608
1106
if value is None: # get
1609
return dbus.UInt64(self.interval.total_seconds() * 1000)
1107
return dbus.UInt64(self.interval_milliseconds())
1610
1108
self.interval = datetime.timedelta(0, 0, 0, value)
1110
self.PropertyChanged(dbus.String("Interval"),
1111
dbus.UInt64(value, variant_level=1))
1611
1112
if getattr(self, "checker_initiator_tag", None) is None:
1614
# Reschedule checker run
1615
gobject.source_remove(self.checker_initiator_tag)
1616
self.checker_initiator_tag = gobject.timeout_add(
1617
value, self.start_checker)
1618
self.start_checker() # Start one now, too
1114
# Reschedule checker run
1115
gobject.source_remove(self.checker_initiator_tag)
1116
self.checker_initiator_tag = (gobject.timeout_add
1117
(value, self.start_checker))
1118
self.start_checker() # Start one now, too
1620
1120
# Checker - property
1621
@dbus_service_property(_interface,
1121
@dbus_service_property(_interface, signature="s",
1623
1122
access="readwrite")
1624
1123
def Checker_dbus_property(self, value=None):
1625
1124
if value is None: # get
1626
1125
return dbus.String(self.checker_command)
1627
self.checker_command = str(value)
1126
self.checker_command = value
1128
self.PropertyChanged(dbus.String("Checker"),
1129
dbus.String(self.checker_command,
1629
1132
# CheckerRunning - property
1630
@dbus_service_property(_interface,
1133
@dbus_service_property(_interface, signature="b",
1632
1134
access="readwrite")
1633
1135
def CheckerRunning_dbus_property(self, value=None):
1634
1136
if value is None: # get
1859
1359
def fingerprint(openpgp):
1860
1360
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
1861
1361
# New GnuTLS "datum" with the OpenPGP public key
1862
datum = gnutls.library.types.gnutls_datum_t(
1863
ctypes.cast(ctypes.c_char_p(openpgp),
1864
ctypes.POINTER(ctypes.c_ubyte)),
1865
ctypes.c_uint(len(openpgp)))
1362
datum = (gnutls.library.types
1363
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1366
ctypes.c_uint(len(openpgp))))
1866
1367
# New empty GnuTLS certificate
1867
1368
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1868
gnutls.library.functions.gnutls_openpgp_crt_init(
1369
(gnutls.library.functions
1370
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
1870
1371
# Import the OpenPGP public key into the certificate
1871
gnutls.library.functions.gnutls_openpgp_crt_import(
1872
crt, ctypes.byref(datum),
1873
gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
1372
(gnutls.library.functions
1373
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1374
gnutls.library.constants
1375
.GNUTLS_OPENPGP_FMT_RAW))
1874
1376
# Verify the self signature in the key
1875
1377
crtverify = ctypes.c_uint()
1876
gnutls.library.functions.gnutls_openpgp_crt_verify_self(
1877
crt, 0, ctypes.byref(crtverify))
1378
(gnutls.library.functions
1379
.gnutls_openpgp_crt_verify_self(crt, 0,
1380
ctypes.byref(crtverify)))
1878
1381
if crtverify.value != 0:
1879
1382
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1880
raise gnutls.errors.CertificateSecurityError(
1383
raise (gnutls.errors.CertificateSecurityError
1882
1385
# New buffer for the fingerprint
1883
1386
buf = ctypes.create_string_buffer(20)
1884
1387
buf_len = ctypes.c_size_t()
1885
1388
# Get the fingerprint from the certificate into the buffer
1886
gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint(
1887
crt, ctypes.byref(buf), ctypes.byref(buf_len))
1389
(gnutls.library.functions
1390
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1391
ctypes.byref(buf_len)))
1888
1392
# Deinit the certificate
1889
1393
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1890
1394
# Convert the buffer to a Python bytestring
1891
1395
fpr = ctypes.string_at(buf, buf_len.value)
1892
1396
# Convert the bytestring to hexadecimal notation
1893
hex_fpr = binascii.hexlify(fpr).upper()
1397
hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
1897
1401
class MultiprocessingMixIn(object):
1898
1402
"""Like socketserver.ThreadingMixIn, but with multiprocessing"""
1900
1403
def sub_process_main(self, request, address):
1902
1405
self.finish_request(request, address)
1904
1407
self.handle_error(request, address)
1905
1408
self.close_request(request)
1907
1410
def process_request(self, request, address):
1908
1411
"""Start a new process to process the request."""
1909
proc = multiprocessing.Process(target = self.sub_process_main,
1910
args = (request, address))
1412
multiprocessing.Process(target = self.sub_process_main,
1413
args = (request, address)).start()
1915
1415
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1916
1416
""" adds a pipe to the MixIn """
1918
1417
def process_request(self, request, client_address):
1919
1418
"""Overrides and wraps the original process_request().
1921
1420
This function creates a new pipe in self.pipe
1923
1422
parent_pipe, self.child_pipe = multiprocessing.Pipe()
1925
proc = MultiprocessingMixIn.process_request(self, request,
1424
super(MultiprocessingMixInWithPipe,
1425
self).process_request(request, client_address)
1927
1426
self.child_pipe.close()
1928
self.add_pipe(parent_pipe, proc)
1930
def add_pipe(self, parent_pipe, proc):
1427
self.add_pipe(parent_pipe)
1429
def add_pipe(self, parent_pipe):
1931
1430
"""Dummy function; override as necessary"""
1932
raise NotImplementedError()
1431
raise NotImplementedError
1935
1433
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1936
1434
socketserver.TCPServer, object):
2039
1504
Assumes a gobject.MainLoop event loop.
2042
1506
def __init__(self, server_address, RequestHandlerClass,
2046
gnutls_priority=None,
1507
interface=None, use_ipv6=True, clients=None,
1508
gnutls_priority=None, use_dbus=True):
2049
1509
self.enabled = False
2050
1510
self.clients = clients
2051
1511
if self.clients is None:
1512
self.clients = set()
2053
1513
self.use_dbus = use_dbus
2054
1514
self.gnutls_priority = gnutls_priority
2055
1515
IPv6_TCPServer.__init__(self, server_address,
2056
1516
RequestHandlerClass,
2057
1517
interface = interface,
2058
use_ipv6 = use_ipv6,
2059
socketfd = socketfd)
1518
use_ipv6 = use_ipv6)
2061
1519
def server_activate(self):
2062
1520
if self.enabled:
2063
1521
return socketserver.TCPServer.server_activate(self)
2065
1522
def enable(self):
2066
1523
self.enabled = True
2068
def add_pipe(self, parent_pipe, proc):
1524
def add_pipe(self, parent_pipe):
2069
1525
# Call "handle_ipc" for both data and EOF events
2070
gobject.io_add_watch(
2071
parent_pipe.fileno(),
2072
gobject.IO_IN | gobject.IO_HUP,
2073
functools.partial(self.handle_ipc,
2074
parent_pipe = parent_pipe,
2077
def handle_ipc(self, source, condition,
1526
gobject.io_add_watch(parent_pipe.fileno(),
1527
gobject.IO_IN | gobject.IO_HUP,
1528
functools.partial(self.handle_ipc,
1529
parent_pipe = parent_pipe))
1531
def handle_ipc(self, source, condition, parent_pipe=None,
2080
1532
client_object=None):
2081
# error, or the other end of multiprocessing.Pipe has closed
2082
if condition & (gobject.IO_ERR | gobject.IO_HUP):
2083
# Wait for other process to exit
1534
gobject.IO_IN: "IN", # There is data to read.
1535
gobject.IO_OUT: "OUT", # Data can be written (without
1537
gobject.IO_PRI: "PRI", # There is urgent data to read.
1538
gobject.IO_ERR: "ERR", # Error condition.
1539
gobject.IO_HUP: "HUP" # Hung up (the connection has been
1540
# broken, usually for pipes and
1543
conditions_string = ' | '.join(name
1545
condition_names.iteritems()
1546
if cond & condition)
1547
# error or the other end of multiprocessing.Pipe has closed
1548
if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
2087
1551
# Read a request from the child
2092
1556
fpr = request[1]
2093
1557
address = request[2]
2095
for c in self.clients.itervalues():
1559
for c in self.clients:
2096
1560
if c.fingerprint == fpr:
2100
logger.info("Client not found for fingerprint: %s, ad"
2101
"dress: %s", fpr, address)
1564
logger.warning("Client not found for fingerprint: %s, ad"
1565
"dress: %s", fpr, address)
2102
1566
if self.use_dbus:
2103
1567
# Emit D-Bus signal
2104
mandos_dbus_service.ClientNotFound(fpr,
1568
mandos_dbus_service.ClientNotFound(fpr, address[0])
2106
1569
parent_pipe.send(False)
2109
gobject.io_add_watch(
2110
parent_pipe.fileno(),
2111
gobject.IO_IN | gobject.IO_HUP,
2112
functools.partial(self.handle_ipc,
2113
parent_pipe = parent_pipe,
2115
client_object = client))
1572
gobject.io_add_watch(parent_pipe.fileno(),
1573
gobject.IO_IN | gobject.IO_HUP,
1574
functools.partial(self.handle_ipc,
1575
parent_pipe = parent_pipe,
1576
client_object = client))
2116
1577
parent_pipe.send(True)
2117
# remove the old hook in favor of the new above hook on
1578
# remove the old hook in favor of the new above hook on same fileno
2120
1580
if command == 'funcall':
2121
1581
funcname = request[1]
2122
1582
args = request[2]
2123
1583
kwargs = request[3]
2125
parent_pipe.send(('data', getattr(client_object,
1585
parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
2129
1587
if command == 'getattr':
2130
1588
attrname = request[1]
2131
1589
if callable(client_object.__getattribute__(attrname)):
2132
parent_pipe.send(('function', ))
1590
parent_pipe.send(('function',))
2135
'data', client_object.__getattribute__(attrname)))
1592
parent_pipe.send(('data', client_object.__getattribute__(attrname)))
2137
1594
if command == 'setattr':
2138
1595
attrname = request[1]
2139
1596
value = request[2]
2140
1597
setattr(client_object, attrname, value)
2145
def rfc3339_duration_to_delta(duration):
2146
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
2148
>>> rfc3339_duration_to_delta("P7D")
2149
datetime.timedelta(7)
2150
>>> rfc3339_duration_to_delta("PT60S")
2151
datetime.timedelta(0, 60)
2152
>>> rfc3339_duration_to_delta("PT60M")
2153
datetime.timedelta(0, 3600)
2154
>>> rfc3339_duration_to_delta("PT24H")
2155
datetime.timedelta(1)
2156
>>> rfc3339_duration_to_delta("P1W")
2157
datetime.timedelta(7)
2158
>>> rfc3339_duration_to_delta("PT5M30S")
2159
datetime.timedelta(0, 330)
2160
>>> rfc3339_duration_to_delta("P1DT3M20S")
2161
datetime.timedelta(1, 200)
2164
# Parsing an RFC 3339 duration with regular expressions is not
2165
# possible - there would have to be multiple places for the same
2166
# values, like seconds. The current code, while more esoteric, is
2167
# cleaner without depending on a parsing library. If Python had a
2168
# built-in library for parsing we would use it, but we'd like to
2169
# avoid excessive use of external libraries.
2171
# New type for defining tokens, syntax, and semantics all-in-one
2172
Token = collections.namedtuple("Token",
2173
("regexp", # To match token; if
2174
# "value" is not None,
2175
# must have a "group"
2177
"value", # datetime.timedelta or
2179
"followers")) # Tokens valid after
2181
Token = collections.namedtuple("Token", (
2182
"regexp", # To match token; if "value" is not None, must have
2183
# a "group" containing digits
2184
"value", # datetime.timedelta or None
2185
"followers")) # Tokens valid after this token
2186
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2187
# the "duration" ABNF definition in RFC 3339, Appendix A.
2188
token_end = Token(re.compile(r"$"), None, frozenset())
2189
token_second = Token(re.compile(r"(\d+)S"),
2190
datetime.timedelta(seconds=1),
2191
frozenset((token_end, )))
2192
token_minute = Token(re.compile(r"(\d+)M"),
2193
datetime.timedelta(minutes=1),
2194
frozenset((token_second, token_end)))
2195
token_hour = Token(re.compile(r"(\d+)H"),
2196
datetime.timedelta(hours=1),
2197
frozenset((token_minute, token_end)))
2198
token_time = Token(re.compile(r"T"),
2200
frozenset((token_hour, token_minute,
2202
token_day = Token(re.compile(r"(\d+)D"),
2203
datetime.timedelta(days=1),
2204
frozenset((token_time, token_end)))
2205
token_month = Token(re.compile(r"(\d+)M"),
2206
datetime.timedelta(weeks=4),
2207
frozenset((token_day, token_end)))
2208
token_year = Token(re.compile(r"(\d+)Y"),
2209
datetime.timedelta(weeks=52),
2210
frozenset((token_month, token_end)))
2211
token_week = Token(re.compile(r"(\d+)W"),
2212
datetime.timedelta(weeks=1),
2213
frozenset((token_end, )))
2214
token_duration = Token(re.compile(r"P"), None,
2215
frozenset((token_year, token_month,
2216
token_day, token_time,
2218
# Define starting values
2219
value = datetime.timedelta() # Value so far
2221
followers = frozenset((token_duration,)) # Following valid tokens
2222
s = duration # String left to parse
2223
# Loop until end token is found
2224
while found_token is not token_end:
2225
# Search for any currently valid tokens
2226
for token in followers:
2227
match = token.regexp.match(s)
2228
if match is not None:
2230
if token.value is not None:
2231
# Value found, parse digits
2232
factor = int(match.group(1), 10)
2233
# Add to value so far
2234
value += factor * token.value
2235
# Strip token from string
2236
s = token.regexp.sub("", s, 1)
2239
# Set valid next tokens
2240
followers = found_token.followers
2243
# No currently valid tokens were found
2244
raise ValueError("Invalid RFC 3339 duration")
2249
1602
def string_to_delta(interval):
2250
1603
"""Parse a string and return a datetime.timedelta
2380
1736
"debug": "False",
2382
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
2383
":+SIGN-RSA-SHA224:+SIGN-RSA-RMD160",
1738
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
2384
1739
"servicename": "Mandos",
2385
1740
"use_dbus": "True",
2386
1741
"use_ipv6": "True",
2387
1742
"debuglevel": "",
2390
"statedir": "/var/lib/mandos",
2391
"foreground": "False",
2395
1745
# Parse config file for server-global settings
2396
1746
server_config = configparser.SafeConfigParser(server_defaults)
2397
1747
del server_defaults
2398
server_config.read(os.path.join(options.configdir, "mandos.conf"))
1748
server_config.read(os.path.join(options.configdir,
2399
1750
# Convert the SafeConfigParser object to a dict
2400
1751
server_settings = server_config.defaults()
2401
1752
# Use the appropriate methods on the non-string config options
2402
for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
1753
for option in ("debug", "use_dbus", "use_ipv6"):
2403
1754
server_settings[option] = server_config.getboolean("DEFAULT",
2405
1756
if server_settings["port"]:
2406
1757
server_settings["port"] = server_config.getint("DEFAULT",
2408
if server_settings["socket"]:
2409
server_settings["socket"] = server_config.getint("DEFAULT",
2411
# Later, stdin will, and stdout and stderr might, be dup'ed
2412
# over with an opened os.devnull. But we don't want this to
2413
# happen with a supplied network socket.
2414
if 0 <= server_settings["socket"] <= 2:
2415
server_settings["socket"] = os.dup(server_settings
2417
1759
del server_config
2419
1761
# Override the settings from the config file with command line
2420
1762
# options, if set.
2421
1763
for option in ("interface", "address", "port", "debug",
2422
"priority", "servicename", "configdir", "use_dbus",
2423
"use_ipv6", "debuglevel", "restore", "statedir",
2424
"socket", "foreground", "zeroconf"):
1764
"priority", "servicename", "configdir",
1765
"use_dbus", "use_ipv6", "debuglevel"):
2425
1766
value = getattr(options, option)
2426
1767
if value is not None:
2427
1768
server_settings[option] = value
2429
1770
# Force all strings to be unicode
2430
1771
for option in server_settings.keys():
2431
if isinstance(server_settings[option], bytes):
2432
server_settings[option] = (server_settings[option]
2434
# Force all boolean options to be boolean
2435
for option in ("debug", "use_dbus", "use_ipv6", "restore",
2436
"foreground", "zeroconf"):
2437
server_settings[option] = bool(server_settings[option])
2438
# Debug implies foreground
2439
if server_settings["debug"]:
2440
server_settings["foreground"] = True
1772
if type(server_settings[option]) is str:
1773
server_settings[option] = unicode(server_settings[option])
2441
1774
# Now we have our good server settings in "server_settings"
2443
1776
##################################################################
2445
if (not server_settings["zeroconf"]
2446
and not (server_settings["port"]
2447
or server_settings["socket"] != "")):
2448
parser.error("Needs port or socket to work without Zeroconf")
2450
1778
# For convenience
2451
1779
debug = server_settings["debug"]
2452
1780
debuglevel = server_settings["debuglevel"]
2453
1781
use_dbus = server_settings["use_dbus"]
2454
1782
use_ipv6 = server_settings["use_ipv6"]
2455
stored_state_path = os.path.join(server_settings["statedir"],
2457
foreground = server_settings["foreground"]
2458
zeroconf = server_settings["zeroconf"]
2461
initlogger(debug, logging.DEBUG)
2466
level = getattr(logging, debuglevel.upper())
2467
initlogger(debug, level)
2469
1784
if server_settings["servicename"] != "Mandos":
2470
syslogger.setFormatter(
2471
logging.Formatter('Mandos ({}) [%(process)d]:'
2472
' %(levelname)s: %(message)s'.format(
2473
server_settings["servicename"])))
1785
syslogger.setFormatter(logging.Formatter
1786
('Mandos (%s) [%%(process)d]:'
1787
' %%(levelname)s: %%(message)s'
1788
% server_settings["servicename"]))
2475
1790
# Parse config file with clients
2476
client_config = configparser.SafeConfigParser(Client
1791
client_defaults = { "timeout": "1h",
1793
"checker": "fping -q -- %%(host)s",
1795
"approval_delay": "0s",
1796
"approval_duration": "1s",
1798
client_config = configparser.SafeConfigParser(client_defaults)
2478
1799
client_config.read(os.path.join(server_settings["configdir"],
2479
1800
"clients.conf"))
2481
1802
global mandos_dbus_service
2482
1803
mandos_dbus_service = None
2485
if server_settings["socket"] != "":
2486
socketfd = server_settings["socket"]
2487
tcp_server = MandosServer(
2488
(server_settings["address"], server_settings["port"]),
2490
interface=(server_settings["interface"] or None),
2492
gnutls_priority=server_settings["priority"],
2496
pidfilename = "/run/mandos.pid"
2497
if not os.path.isdir("/run/."):
2498
pidfilename = "/var/run/mandos.pid"
1805
tcp_server = MandosServer((server_settings["address"],
1806
server_settings["port"]),
1808
interface=(server_settings["interface"]
1812
server_settings["priority"],
1815
pidfilename = "/var/run/mandos.pid"
2501
1817
pidfile = open(pidfilename, "w")
2502
except IOError as e:
2503
logger.error("Could not open file %r", pidfilename,
1819
logger.error("Could not open file %r", pidfilename)
2506
for name in ("_mandos", "mandos", "nobody"):
1822
uid = pwd.getpwnam("_mandos").pw_uid
1823
gid = pwd.getpwnam("_mandos").pw_gid
2508
uid = pwd.getpwnam(name).pw_uid
2509
gid = pwd.getpwnam(name).pw_gid
1826
uid = pwd.getpwnam("mandos").pw_uid
1827
gid = pwd.getpwnam("mandos").pw_gid
2511
1828
except KeyError:
1830
uid = pwd.getpwnam("nobody").pw_uid
1831
gid = pwd.getpwnam("nobody").pw_gid
2519
1838
except OSError as error:
2520
if error.errno != errno.EPERM:
1839
if error[0] != errno.EPERM:
1842
if not debug and not debuglevel:
1843
syslogger.setLevel(logging.WARNING)
1844
console.setLevel(logging.WARNING)
1846
level = getattr(logging, debuglevel.upper())
1847
syslogger.setLevel(level)
1848
console.setLevel(level)
2524
1851
# Enable all possible GnuTLS debugging
2531
1858
def debug_gnutls(level, string):
2532
1859
logger.debug("GnuTLS: %s", string[:-1])
2534
gnutls.library.functions.gnutls_global_set_log_function(
1861
(gnutls.library.functions
1862
.gnutls_global_set_log_function(debug_gnutls))
2537
1864
# Redirect stdin so all checkers get /dev/null
2538
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
1865
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2539
1866
os.dup2(null, sys.stdin.fileno())
1870
# No console logging
1871
logger.removeHandler(console)
2543
1873
# Need to fork before connecting to D-Bus
2545
1875
# Close all input and output, do double fork, etc.
2548
# multiprocessing will use threads, so before we use gobject we
2549
# need to inform gobject that threads will be used.
2550
gobject.threads_init()
2552
1878
global main_loop
2553
1879
# From the Avahi example code
2554
DBusGMainLoop(set_as_default=True)
1880
DBusGMainLoop(set_as_default=True )
2555
1881
main_loop = gobject.MainLoop()
2556
1882
bus = dbus.SystemBus()
2557
1883
# End of Avahi example code
2560
bus_name = dbus.service.BusName("se.recompile.Mandos",
2563
old_bus_name = dbus.service.BusName(
2564
"se.bsnet.fukt.Mandos", bus,
1886
bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
1887
bus, do_not_queue=True)
2566
1888
except dbus.exceptions.NameExistsException as e:
2567
logger.error("Disabling D-Bus:", exc_info=e)
1889
logger.error(unicode(e) + ", disabling D-Bus")
2568
1890
use_dbus = False
2569
1891
server_settings["use_dbus"] = False
2570
1892
tcp_server.use_dbus = False
2572
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2573
service = AvahiServiceToSyslog(
2574
name = server_settings["servicename"],
2575
servicetype = "_mandos._tcp",
2576
protocol = protocol,
2578
if server_settings["interface"]:
2579
service.interface = if_nametoindex(
2580
server_settings["interface"].encode("utf-8"))
1893
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1894
service = AvahiService(name = server_settings["servicename"],
1895
servicetype = "_mandos._tcp",
1896
protocol = protocol, bus = bus)
1897
if server_settings["interface"]:
1898
service.interface = (if_nametoindex
1899
(str(server_settings["interface"])))
2582
1901
global multiprocessing_manager
2583
1902
multiprocessing_manager = multiprocessing.Manager()
2585
1904
client_class = Client
2587
1906
client_class = functools.partial(ClientDBus, bus = bus)
2589
client_settings = Client.config_parser(client_config)
2590
old_client_settings = {}
2593
# This is used to redirect stdout and stderr for checker processes
2595
wnull = open(os.devnull, "w") # A writable /dev/null
2596
# Only used if server is running in foreground but not in debug
2598
if debug or not foreground:
2601
# Get client data and settings from last running state.
2602
if server_settings["restore"]:
2604
with open(stored_state_path, "rb") as stored_state:
2605
clients_data, old_client_settings = pickle.load(
2607
os.remove(stored_state_path)
2608
except IOError as e:
2609
if e.errno == errno.ENOENT:
2610
logger.warning("Could not load persistent state:"
2611
" {}".format(os.strerror(e.errno)))
2613
logger.critical("Could not load persistent state:",
2616
except EOFError as e:
2617
logger.warning("Could not load persistent state: "
2621
with PGPEngine() as pgp:
2622
for client_name, client in clients_data.items():
2623
# Skip removed clients
2624
if client_name not in client_settings:
2627
# Decide which value to use after restoring saved state.
2628
# We have three different values: Old config file,
2629
# new config file, and saved state.
2630
# New config value takes precedence if it differs from old
2631
# config value, otherwise use saved state.
2632
for name, value in client_settings[client_name].items():
2634
# For each value in new config, check if it
2635
# differs from the old config value (Except for
2636
# the "secret" attribute)
2637
if (name != "secret"
2639
old_client_settings[client_name][name])):
2640
client[name] = value
2644
# Clients who has passed its expire date can still be
2645
# enabled if its last checker was successful. Clients
2646
# whose checker succeeded before we stored its state is
2647
# assumed to have successfully run all checkers during
2649
if client["enabled"]:
2650
if datetime.datetime.utcnow() >= client["expires"]:
2651
if not client["last_checked_ok"]:
2653
"disabling client {} - Client never "
2654
"performed a successful checker".format(
2656
client["enabled"] = False
2657
elif client["last_checker_status"] != 0:
2659
"disabling client {} - Client last"
2660
" checker failed with error code"
2663
client["last_checker_status"]))
2664
client["enabled"] = False
2666
client["expires"] = (
2667
datetime.datetime.utcnow()
2668
+ client["timeout"])
2669
logger.debug("Last checker succeeded,"
2670
" keeping {} enabled".format(
1907
def client_config_items(config, section):
1908
special_settings = {
1909
"approved_by_default":
1910
lambda: config.getboolean(section,
1911
"approved_by_default"),
1913
for name, value in config.items(section):
2673
client["secret"] = pgp.decrypt(
2674
client["encrypted_secret"],
2675
client_settings[client_name]["secret"])
2677
# If decryption fails, we use secret from new settings
2678
logger.debug("Failed to decrypt {} old secret".format(
2680
client["secret"] = (client_settings[client_name]
2683
# Add/remove clients based on new changes made to config
2684
for client_name in (set(old_client_settings)
2685
- set(client_settings)):
2686
del clients_data[client_name]
2687
for client_name in (set(client_settings)
2688
- set(old_client_settings)):
2689
clients_data[client_name] = client_settings[client_name]
2691
# Create all client objects
2692
for client_name, client in clients_data.items():
2693
tcp_server.clients[client_name] = client_class(
2696
server_settings = server_settings)
1915
yield (name, special_settings[name]())
1919
tcp_server.clients.update(set(
1920
client_class(name = section,
1921
config= dict(client_config_items(
1922
client_config, section)))
1923
for section in client_config.sections()))
2698
1924
if not tcp_server.clients:
2699
1925
logger.warning("No clients defined")
2702
if pidfile is not None:
2706
pidfile.write("{}\n".format(pid).encode("utf-8"))
2708
logger.error("Could not write to file %r with PID %d",
1931
pidfile.write(str(pid) + "\n".encode("utf-8"))
1934
logger.error("Could not write to file %r with PID %d",
1937
# "pidfile" was never created
2711
1939
del pidfilename
1941
signal.signal(signal.SIGINT, signal.SIG_IGN)
2713
1943
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2714
1944
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2718
@alternate_dbus_interfaces(
2719
{ "se.recompile.Mandos": "se.bsnet.fukt.Mandos" })
2720
class MandosDBusService(DBusObjectWithProperties):
1947
class MandosDBusService(dbus.service.Object):
2721
1948
"""A D-Bus proxy object"""
2723
1949
def __init__(self):
2724
1950
dbus.service.Object.__init__(self, bus, "/")
2726
_interface = "se.recompile.Mandos"
2728
@dbus_interface_annotations(_interface)
2731
"org.freedesktop.DBus.Property.EmitsChangedSignal":
1951
_interface = "se.bsnet.fukt.Mandos"
2734
1953
@dbus.service.signal(_interface, signature="o")
2735
1954
def ClientAdded(self, objpath):
2783
2002
"Cleanup function; run on exit"
2787
multiprocessing.active_children()
2789
if not (tcp_server.clients or client_settings):
2792
# Store client before exiting. Secrets are encrypted with key
2793
# based on what config file has. If config file is
2794
# removed/edited, old secret will thus be unrecovable.
2796
with PGPEngine() as pgp:
2797
for client in tcp_server.clients.itervalues():
2798
key = client_settings[client.name]["secret"]
2799
client.encrypted_secret = pgp.encrypt(client.secret,
2803
# A list of attributes that can not be pickled
2805
exclude = { "bus", "changedstate", "secret",
2806
"checker", "server_settings" }
2807
for name, typ in inspect.getmembers(dbus.service
2811
client_dict["encrypted_secret"] = (client
2813
for attr in client.client_structure:
2814
if attr not in exclude:
2815
client_dict[attr] = getattr(client, attr)
2817
clients[client.name] = client_dict
2818
del client_settings[client.name]["secret"]
2821
with tempfile.NamedTemporaryFile(
2825
dir=os.path.dirname(stored_state_path),
2826
delete=False) as stored_state:
2827
pickle.dump((clients, client_settings), stored_state)
2828
tempname = stored_state.name
2829
os.rename(tempname, stored_state_path)
2830
except (IOError, OSError) as e:
2836
if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2837
logger.warning("Could not save persistent state: {}"
2838
.format(os.strerror(e.errno)))
2840
logger.warning("Could not save persistent state:",
2844
# Delete all clients, and settings from config
2845
2005
while tcp_server.clients:
2846
name, client = tcp_server.clients.popitem()
2006
client = tcp_server.clients.pop()
2848
2008
client.remove_from_connection()
2009
client.disable_hook = None
2849
2010
# Don't signal anything except ClientRemoved
2850
2011
client.disable(quiet=True)
2852
2013
# Emit D-Bus signal
2853
mandos_dbus_service.ClientRemoved(
2854
client.dbus_object_path, client.name)
2855
client_settings.clear()
2014
mandos_dbus_service.ClientRemoved(client.dbus_object_path,
2857
2017
atexit.register(cleanup)
2859
for client in tcp_server.clients.itervalues():
2019
for client in tcp_server.clients:
2861
2021
# Emit D-Bus signal
2862
2022
mandos_dbus_service.ClientAdded(client.dbus_object_path)
2863
# Need to initiate checking of clients
2865
client.init_checker()
2867
2025
tcp_server.enable()
2868
2026
tcp_server.server_activate()
2870
2028
# Find out what port we got
2872
service.port = tcp_server.socket.getsockname()[1]
2029
service.port = tcp_server.socket.getsockname()[1]
2874
2031
logger.info("Now listening on address %r, port %d,"
2875
" flowinfo %d, scope_id %d",
2876
*tcp_server.socket.getsockname())
2032
" flowinfo %d, scope_id %d"
2033
% tcp_server.socket.getsockname())
2878
logger.info("Now listening on address %r, port %d",
2879
*tcp_server.socket.getsockname())
2035
logger.info("Now listening on address %r, port %d"
2036
% tcp_server.socket.getsockname())
2881
2038
#service.interface = tcp_server.socket.getsockname()[3]
2885
# From the Avahi example code
2888
except dbus.exceptions.DBusException as error:
2889
logger.critical("D-Bus Exception", exc_info=error)
2892
# End of Avahi example code
2041
# From the Avahi example code
2044
except dbus.exceptions.DBusException as error:
2045
logger.critical("DBusException: %s", error)
2048
# End of Avahi example code
2894
2050
gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2895
2051
lambda *args, **kwargs: