104
103
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
105
104
with contextlib.closing(socket.socket()) as s:
106
105
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
107
struct.pack(b"16s16x", interface))
108
interface_index = struct.unpack("I", ifreq[16:20])[0]
106
struct.pack(str("16s16x"),
108
interface_index = struct.unpack(str("I"),
109
110
return interface_index
112
def initlogger(debug, level=logging.WARNING):
113
def initlogger(level=logging.WARNING):
113
114
"""init logger and add loglevel"""
116
syslogger = (logging.handlers.SysLogHandler
118
logging.handlers.SysLogHandler.LOG_DAEMON,
119
address = "/dev/log"))
120
116
syslogger.setFormatter(logging.Formatter
121
117
('Mandos [%(process)d]: %(levelname)s:'
123
119
logger.addHandler(syslogger)
126
console = logging.StreamHandler()
127
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
131
logger.addHandler(console)
121
console = logging.StreamHandler()
122
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
126
logger.addHandler(console)
132
127
logger.setLevel(level)
173
169
def password_encode(self, password):
174
170
# Passphrase can not be empty and can not contain newlines or
175
171
# NUL bytes. So we prefix it and hex encode it.
176
encoded = b"mandos" + binascii.hexlify(password)
177
if len(encoded) > 2048:
178
# GnuPG can't handle long passwords, so encode differently
179
encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
180
.replace(b"\n", b"\\n")
181
.replace(b"\0", b"\\x00"))
172
return b"mandos" + binascii.hexlify(password)
184
174
def encrypt(self, data, password):
185
passphrase = self.password_encode(password)
186
with tempfile.NamedTemporaryFile(dir=self.tempdir
188
passfile.write(passphrase)
190
proc = subprocess.Popen(['gpg', '--symmetric',
194
stdin = subprocess.PIPE,
195
stdout = subprocess.PIPE,
196
stderr = subprocess.PIPE)
197
ciphertext, err = proc.communicate(input = data)
198
if proc.returncode != 0:
175
self.gnupg.passphrase = self.password_encode(password)
176
with open(os.devnull) as devnull:
178
proc = self.gnupg.run(['--symmetric'],
179
create_fhs=['stdin', 'stdout'],
180
attach_fhs={'stderr': devnull})
181
with contextlib.closing(proc.handles['stdin']) as f:
183
with contextlib.closing(proc.handles['stdout']) as f:
184
ciphertext = f.read()
188
self.gnupg.passphrase = None
200
189
return ciphertext
202
191
def decrypt(self, data, password):
203
passphrase = self.password_encode(password)
204
with tempfile.NamedTemporaryFile(dir = self.tempdir
206
passfile.write(passphrase)
208
proc = subprocess.Popen(['gpg', '--decrypt',
212
stdin = subprocess.PIPE,
213
stdout = subprocess.PIPE,
214
stderr = subprocess.PIPE)
215
decrypted_plaintext, err = proc.communicate(input
217
if proc.returncode != 0:
192
self.gnupg.passphrase = self.password_encode(password)
193
with open(os.devnull) as devnull:
195
proc = self.gnupg.run(['--decrypt'],
196
create_fhs=['stdin', 'stdout'],
197
attach_fhs={'stderr': devnull})
198
with contextlib.closing(proc.handles['stdin'] ) as f:
200
with contextlib.closing(proc.handles['stdout']) as f:
201
decrypted_plaintext = f.read()
205
self.gnupg.passphrase = None
219
206
return decrypted_plaintext
222
210
class AvahiError(Exception):
223
211
def __init__(self, value, *args, **kwargs):
224
212
self.value = value
225
return super(AvahiError, self).__init__(value, *args,
213
super(AvahiError, self).__init__(value, *args, **kwargs)
214
def __unicode__(self):
215
return unicode(repr(self.value))
228
217
class AvahiServiceError(AvahiError):
386
367
self.server_state_changed)
387
368
self.server_state_changed(self.server.GetState())
390
370
class AvahiServiceToSyslog(AvahiService):
391
371
def rename(self):
392
372
"""Add the new name to the syslog messages"""
393
373
ret = AvahiService.rename(self)
394
374
syslogger.setFormatter(logging.Formatter
395
('Mandos ({}) [%(process)d]:'
396
' %(levelname)s: %(message)s'
375
('Mandos (%s) [%%(process)d]:'
376
' %%(levelname)s: %%(message)s'
380
def timedelta_to_milliseconds(td):
381
"Convert a datetime.timedelta() to milliseconds"
382
return ((td.days * 24 * 60 * 60 * 1000)
383
+ (td.seconds * 1000)
384
+ (td.microseconds // 1000))
401
386
class Client(object):
402
387
"""A representation of a client host served by this server.
428
413
last_checked_ok: datetime.datetime(); (UTC) or None
429
414
last_checker_status: integer between 0 and 255 reflecting exit
430
415
status of last checker. -1 reflects crashed
431
checker, -2 means no checker completed yet.
432
417
last_enabled: datetime.datetime(); (UTC) or None
433
418
name: string; from the config file, used in log messages and
434
419
D-Bus identifiers
435
420
secret: bytestring; sent verbatim (over TLS) to client
436
421
timeout: datetime.timedelta(); How long from last_checked_ok
437
422
until this client is disabled
438
extended_timeout: extra long timeout when secret has been sent
423
extended_timeout: extra long timeout when password has been sent
439
424
runtime_expansions: Allowed attributes for runtime expansion.
440
425
expires: datetime.datetime(); time (UTC) when a client will be
441
426
disabled, or None
442
server_settings: The server_settings dict from main()
445
429
runtime_expansions = ("approval_delay", "approval_duration",
446
"created", "enabled", "expires",
447
"fingerprint", "host", "interval",
448
"last_approval_request", "last_checked_ok",
430
"created", "enabled", "fingerprint",
431
"host", "interval", "last_checked_ok",
449
432
"last_enabled", "name", "timeout")
450
client_defaults = { "timeout": "PT5M",
451
"extended_timeout": "PT15M",
433
client_defaults = { "timeout": "5m",
434
"extended_timeout": "15m",
453
436
"checker": "fping -q -- %%(host)s",
455
"approval_delay": "PT0S",
456
"approval_duration": "PT1S",
438
"approval_delay": "0s",
439
"approval_duration": "1s",
457
440
"approved_by_default": "True",
458
441
"enabled": "True",
444
def timeout_milliseconds(self):
445
"Return the 'timeout' attribute in milliseconds"
446
return timedelta_to_milliseconds(self.timeout)
448
def extended_timeout_milliseconds(self):
449
"Return the 'extended_timeout' attribute in milliseconds"
450
return timedelta_to_milliseconds(self.extended_timeout)
452
def interval_milliseconds(self):
453
"Return the 'interval' attribute in milliseconds"
454
return timedelta_to_milliseconds(self.interval)
456
def approval_delay_milliseconds(self):
457
return timedelta_to_milliseconds(self.approval_delay)
462
460
def config_parser(config):
463
"""Construct a new dict of client settings of this form:
461
""" Construct a new dict of client settings of this form:
464
462
{ 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.
463
with exceptions for any special settings as defined above"""
470
465
for client_name in config.sections():
471
466
section = dict(config.items(client_name))
501
495
client["checker_command"] = section["checker"]
502
496
client["last_approval_request"] = None
503
497
client["last_checked_ok"] = None
504
client["last_checker_status"] = -2
498
client["last_checker_status"] = None
499
if client["enabled"]:
500
client["last_enabled"] = datetime.datetime.utcnow()
501
client["expires"] = (datetime.datetime.utcnow()
504
client["last_enabled"] = None
505
client["expires"] = None
508
def __init__(self, settings, name = None, server_settings=None):
510
def __init__(self, settings, name = None):
511
"""Note: the 'checker' key in 'config' sets the
512
'checker_command' attribute and *not* the 'checker'
510
if server_settings is None:
512
self.server_settings = server_settings
513
515
# adding all client settings
514
for setting, value in settings.items():
516
for setting, value in settings.iteritems():
515
517
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()
524
self.last_enabled = None
527
519
logger.debug("Creating client %r", self.name)
528
520
# Uppercase and remove spaces from fingerprint for later
529
521
# comparison purposes with return value from the fingerprint()
531
523
logger.debug(" Fingerprint: %s", self.fingerprint)
532
self.created = settings.get("created",
533
datetime.datetime.utcnow())
524
self.created = settings.get("created", datetime.datetime.utcnow())
535
526
# attributes specific for this server instance
536
527
self.checker = None
537
528
self.checker_initiator_tag = None
565
556
if getattr(self, "enabled", False):
566
557
# Already enabled
559
self.send_changedstate()
568
560
self.expires = datetime.datetime.utcnow() + self.timeout
569
561
self.enabled = True
570
562
self.last_enabled = datetime.datetime.utcnow()
571
563
self.init_checker()
572
self.send_changedstate()
574
565
def disable(self, quiet=True):
575
566
"""Disable this client."""
576
567
if not getattr(self, "enabled", False):
570
self.send_changedstate()
579
572
logger.info("Disabling client %s", self.name)
580
if getattr(self, "disable_initiator_tag", None) is not None:
573
if getattr(self, "disable_initiator_tag", False):
581
574
gobject.source_remove(self.disable_initiator_tag)
582
575
self.disable_initiator_tag = None
583
576
self.expires = None
584
if getattr(self, "checker_initiator_tag", None) is not None:
577
if getattr(self, "checker_initiator_tag", False):
585
578
gobject.source_remove(self.checker_initiator_tag)
586
579
self.checker_initiator_tag = None
587
580
self.stop_checker()
588
581
self.enabled = False
590
self.send_changedstate()
591
582
# Do not run this again if called by a gobject.timeout_add
597
588
def init_checker(self):
598
589
# Schedule a new checker to be started an 'interval' from now,
599
590
# and every interval from then on.
600
if self.checker_initiator_tag is not None:
601
gobject.source_remove(self.checker_initiator_tag)
602
591
self.checker_initiator_tag = (gobject.timeout_add
604
.total_seconds() * 1000),
592
(self.interval_milliseconds(),
605
593
self.start_checker))
606
594
# Schedule a disable() when 'timeout' has passed
607
if self.disable_initiator_tag is not None:
608
gobject.source_remove(self.disable_initiator_tag)
609
595
self.disable_initiator_tag = (gobject.timeout_add
611
.total_seconds() * 1000),
596
(self.timeout_milliseconds(),
613
598
# Also start a new checker *right now*.
614
599
self.start_checker()
631
616
logger.warning("Checker for %(name)s crashed?",
634
def checked_ok(self):
635
"""Assert that the client has been seen, alive and well."""
636
self.last_checked_ok = datetime.datetime.utcnow()
637
self.last_checker_status = 0
640
def bump_timeout(self, timeout=None):
641
"""Bump up the timeout for this client."""
619
def checked_ok(self, timeout=None):
620
"""Bump up the timeout for this client.
622
This should only be called when the client has been seen,
642
625
if timeout is None:
643
626
timeout = self.timeout
627
self.last_checked_ok = datetime.datetime.utcnow()
644
628
if self.disable_initiator_tag is not None:
645
629
gobject.source_remove(self.disable_initiator_tag)
646
self.disable_initiator_tag = None
647
630
if getattr(self, "enabled", False):
648
631
self.disable_initiator_tag = (gobject.timeout_add
649
(int(timeout.total_seconds()
650
* 1000), self.disable))
632
(timedelta_to_milliseconds
633
(timeout), self.disable))
651
634
self.expires = datetime.datetime.utcnow() + timeout
653
636
def need_approval(self):
659
642
If a checker already exists, leave it running and do
661
644
# The reason for not killing a running checker is that if we
662
# did that, and if a checker (for some reason) started running
663
# slowly and taking more than 'interval' time, then the client
664
# would inevitably timeout, since no checker would get a
665
# chance to run to completion. If we instead leave running
645
# did that, then if a checker (for some reason) started
646
# running slowly and taking more than 'interval' time, the
647
# client would inevitably timeout, since no checker would get
648
# a chance to run to completion. If we instead leave running
666
649
# checkers alone, the checker would have to take more time
667
650
# than 'timeout' for the client to be disabled, which is as it
683
665
self.current_checker_command)
684
666
# Start a new checker if needed
685
667
if self.checker is None:
686
# Escape attributes for the shell
687
escaped_attrs = { attr:
688
re.escape(unicode(getattr(self,
690
for attr in self.runtime_expansions }
692
command = self.checker_command % escaped_attrs
693
except TypeError as error:
694
logger.error('Could not format string "%s"',
695
self.checker_command, exc_info=error)
696
return True # Try again later
669
# In case checker_command has exactly one % operator
670
command = self.checker_command % self.host
672
# Escape attributes for the shell
673
escaped_attrs = dict(
675
re.escape(unicode(str(getattr(self, attr, "")),
679
self.runtime_expansions)
682
command = self.checker_command % escaped_attrs
683
except TypeError as error:
684
logger.error('Could not format string "%s":'
685
' %s', self.checker_command, error)
686
return True # Try again later
697
687
self.current_checker_command = command
699
689
logger.info("Starting checker %r for %s",
702
692
# in normal mode, that is already done by daemon(),
703
693
# and in debug mode we don't want to. (Stdin is
704
694
# always replaced by /dev/null.)
705
# The exception is when not debugging but nevertheless
706
# running in the foreground; use the previously
709
if (not self.server_settings["debug"]
710
and self.server_settings["foreground"]):
711
popen_args.update({"stdout": wnull,
713
695
self.checker = subprocess.Popen(command,
717
except OSError as error:
718
logger.error("Failed to start subprocess",
721
self.checker_callback_tag = (gobject.child_watch_add
723
self.checker_callback,
725
# The checker may have completed before the gobject
726
# watch was added. Check for this.
698
self.checker_callback_tag = (gobject.child_watch_add
700
self.checker_callback,
702
# The checker may have completed before the gobject
703
# watch was added. Check for this.
728
704
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
706
gobject.source_remove(self.checker_callback_tag)
707
self.checker_callback(pid, status, command)
729
708
except OSError as error:
730
if error.errno == errno.ECHILD:
731
# This should never happen
732
logger.error("Child process vanished",
737
gobject.source_remove(self.checker_callback_tag)
738
self.checker_callback(pid, status, command)
709
logger.error("Failed to start subprocess: %s",
739
711
# Re-run this periodically if run by gobject.timeout_add
791
def dbus_interface_annotations(dbus_interface):
792
"""Decorator for marking functions returning interface annotations
796
@dbus_interface_annotations("org.example.Interface")
797
def _foo(self): # Function name does not matter
798
return {"org.freedesktop.DBus.Deprecated": "true",
799
"org.freedesktop.DBus.Property.EmitsChangedSignal":
803
func._dbus_is_interface = True
804
func._dbus_interface = dbus_interface
805
func._dbus_name = dbus_interface
810
def dbus_annotations(annotations):
811
"""Decorator to annotate D-Bus methods, signals or properties
814
@dbus_service_property("org.example.Interface", signature="b",
816
@dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
817
"org.freedesktop.DBus.Property."
818
"EmitsChangedSignal": "false"})
819
def Property_dbus_property(self):
820
return dbus.Boolean(False)
823
func._dbus_annotations = annotations
828
763
class DBusPropertyException(dbus.exceptions.DBusException):
829
764
"""A base class for D-Bus property-related exceptions
766
def __unicode__(self):
767
return unicode(str(self))
833
770
class DBusPropertyAccessException(DBusPropertyException):
834
771
"""A property's access permissions disallows an operation.
854
def _is_dbus_thing(thing):
855
"""Returns a function testing if an attribute is a D-Bus thing
857
If called like _is_dbus_thing("method") it returns a function
858
suitable for use as predicate to inspect.getmembers().
860
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
791
def _is_dbus_property(obj):
792
return getattr(obj, "_dbus_is_property", False)
863
def _get_all_dbus_things(self, thing):
794
def _get_all_dbus_properties(self):
864
795
"""Returns a generator of (name, attribute) pairs
866
return ((getattr(athing.__get__(self), "_dbus_name",
868
athing.__get__(self))
797
return ((prop.__get__(self)._dbus_name, prop.__get__(self))
869
798
for cls in self.__class__.__mro__
871
inspect.getmembers(cls,
872
self._is_dbus_thing(thing)))
800
inspect.getmembers(cls, self._is_dbus_property))
874
802
def _get_dbus_property(self, interface_name, property_name):
875
803
"""Returns a bound method if one exists which is a D-Bus
964
887
e.setAttribute("access", prop._dbus_access)
966
889
for if_tag in document.getElementsByTagName("interface"):
968
890
for tag in (make_tag(document, name, prop)
970
in self._get_all_dbus_things("property")
892
in self._get_all_dbus_properties()
971
893
if prop._dbus_interface
972
894
== if_tag.getAttribute("name")):
973
895
if_tag.appendChild(tag)
974
# Add annotation tags
975
for typ in ("method", "signal", "property"):
976
for tag in if_tag.getElementsByTagName(typ):
978
for name, prop in (self.
979
_get_all_dbus_things(typ)):
980
if (name == tag.getAttribute("name")
981
and prop._dbus_interface
982
== if_tag.getAttribute("name")):
983
annots.update(getattr
987
for name, value in annots.items():
988
ann_tag = document.createElement(
990
ann_tag.setAttribute("name", name)
991
ann_tag.setAttribute("value", value)
992
tag.appendChild(ann_tag)
993
# Add interface annotation tags
994
for annotation, value in dict(
995
itertools.chain.from_iterable(
996
annotations().items()
997
for name, annotations in
998
self._get_all_dbus_things("interface")
999
if name == if_tag.getAttribute("name")
1001
ann_tag = document.createElement("annotation")
1002
ann_tag.setAttribute("name", annotation)
1003
ann_tag.setAttribute("value", value)
1004
if_tag.appendChild(ann_tag)
1005
896
# Add the names to the return values for the
1006
897
# "org.freedesktop.DBus.Properties" methods
1007
898
if (if_tag.getAttribute("name")
1034
925
variant_level=variant_level)
1037
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1038
"""A class decorator; applied to a subclass of
1039
dbus.service.Object, it will add alternate D-Bus attributes with
1040
interface names according to the "alt_interface_names" mapping.
1043
@alternate_dbus_interfaces({"org.example.Interface":
1044
"net.example.AlternateInterface"})
1045
class SampleDBusObject(dbus.service.Object):
1046
@dbus.service.method("org.example.Interface")
1047
def SampleDBusMethod():
1050
The above "SampleDBusMethod" on "SampleDBusObject" will be
1051
reachable via two interfaces: "org.example.Interface" and
1052
"net.example.AlternateInterface", the latter of which will have
1053
its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
1054
"true", unless "deprecate" is passed with a False value.
1056
This works for methods and signals, and also for D-Bus properties
1057
(from DBusObjectWithProperties) and interfaces (from the
1058
dbus_interface_annotations decorator).
928
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
930
"""Applied to an empty subclass of a D-Bus object, this metaclass
931
will add additional D-Bus attributes matching a certain pattern.
1061
for orig_interface_name, alt_interface_name in (
1062
alt_interface_names.items()):
1064
interface_names = set()
1065
# Go though all attributes of the class
1066
for attrname, attribute in inspect.getmembers(cls):
933
def __new__(mcs, name, bases, attr):
934
# Go through all the base classes which could have D-Bus
935
# methods, signals, or properties in them
936
for base in (b for b in bases
937
if issubclass(b, dbus.service.Object)):
938
# Go though all attributes of the base class
939
for attrname, attribute in inspect.getmembers(base):
1067
940
# Ignore non-D-Bus attributes, and D-Bus attributes
1068
941
# with the wrong interface name
1069
942
if (not hasattr(attribute, "_dbus_interface")
1070
943
or not attribute._dbus_interface
1071
.startswith(orig_interface_name)):
944
.startswith("se.recompile.Mandos")):
1073
946
# Create an alternate D-Bus interface name based on
1074
947
# the current name
1075
948
alt_interface = (attribute._dbus_interface
1076
.replace(orig_interface_name,
1077
alt_interface_name))
1078
interface_names.add(alt_interface)
949
.replace("se.recompile.Mandos",
950
"se.bsnet.fukt.Mandos"))
1079
951
# Is this a D-Bus signal?
1080
952
if getattr(attribute, "_dbus_is_signal", False):
1081
# Extract the original non-method undecorated
1082
# function by black magic
953
# Extract the original non-method function by
1083
955
nonmethod_func = (dict(
1084
956
zip(attribute.func_code.co_freevars,
1085
957
attribute.__closure__))["func"]
1096
968
nonmethod_func.func_name,
1097
969
nonmethod_func.func_defaults,
1098
970
nonmethod_func.func_closure)))
1099
# Copy annotations, if any
1101
new_function._dbus_annotations = (
1102
dict(attribute._dbus_annotations))
1103
except AttributeError:
1105
971
# Define a creator of a function to call both the
1106
# original and alternate functions, so both the
1107
# original and alternate signals gets sent when
1108
# the function is called
972
# old and new functions, so both the old and new
973
# signals gets sent when the function is called
1109
974
def fixscope(func1, func2):
1110
975
"""This function is a scope container to pass
1111
976
func1 and func2 to the "call_both" function
1160
1020
attribute.func_name,
1161
1021
attribute.func_defaults,
1162
1022
attribute.func_closure)))
1163
# Copy annotations, if any
1165
attr[attrname]._dbus_annotations = (
1166
dict(attribute._dbus_annotations))
1167
except AttributeError:
1169
# Is this a D-Bus interface?
1170
elif getattr(attribute, "_dbus_is_interface", False):
1171
# Create a new, but exactly alike, function
1172
# object. Decorate it to be a new D-Bus interface
1173
# with the alternate D-Bus interface name. Add it
1175
attr[attrname] = (dbus_interface_annotations
1178
(attribute.func_code,
1179
attribute.func_globals,
1180
attribute.func_name,
1181
attribute.func_defaults,
1182
attribute.func_closure)))
1184
# Deprecate all alternate interfaces
1185
iname="_AlternateDBusNames_interface_annotation{}"
1186
for interface_name in interface_names:
1187
@dbus_interface_annotations(interface_name)
1189
return { "org.freedesktop.DBus.Deprecated":
1191
# Find an unused name
1192
for aname in (iname.format(i)
1193
for i in itertools.count()):
1194
if aname not in attr:
1198
# Replace the class with a new subclass of it with
1199
# methods, signals, etc. as created above.
1200
cls = type(b"{}Alternate".format(cls.__name__),
1206
@alternate_dbus_interfaces({"se.recompile.Mandos":
1207
"se.bsnet.fukt.Mandos"})
1023
return type.__new__(mcs, name, bases, attr)
1208
1026
class ClientDBus(Client, DBusObjectWithProperties):
1209
1027
"""A Client class using D-Bus
1280
1100
approval_delay = notifychangeproperty(dbus.UInt64,
1281
1101
"ApprovalDelay",
1283
lambda td: td.total_seconds()
1103
timedelta_to_milliseconds)
1285
1104
approval_duration = notifychangeproperty(
1286
1105
dbus.UInt64, "ApprovalDuration",
1287
type_func = lambda td: td.total_seconds() * 1000)
1106
type_func = timedelta_to_milliseconds)
1288
1107
host = notifychangeproperty(dbus.String, "Host")
1289
1108
timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1290
type_func = lambda td:
1291
td.total_seconds() * 1000)
1110
timedelta_to_milliseconds)
1292
1111
extended_timeout = notifychangeproperty(
1293
1112
dbus.UInt64, "ExtendedTimeout",
1294
type_func = lambda td: td.total_seconds() * 1000)
1113
type_func = timedelta_to_milliseconds)
1295
1114
interval = notifychangeproperty(dbus.UInt64,
1298
lambda td: td.total_seconds()
1117
timedelta_to_milliseconds)
1300
1118
checker_command = notifychangeproperty(dbus.String, "Checker")
1302
1120
del notifychangeproperty
1537
1355
access="readwrite")
1538
1356
def Timeout_dbus_property(self, value=None):
1539
1357
if value is None: # get
1540
return dbus.UInt64(self.timeout.total_seconds() * 1000)
1541
old_timeout = self.timeout
1358
return dbus.UInt64(self.timeout_milliseconds())
1542
1359
self.timeout = datetime.timedelta(0, 0, 0, value)
1543
# Reschedule disabling
1545
now = datetime.datetime.utcnow()
1546
self.expires += self.timeout - old_timeout
1547
if self.expires <= now:
1548
# The timeout has passed
1551
if (getattr(self, "disable_initiator_tag", None)
1554
gobject.source_remove(self.disable_initiator_tag)
1555
self.disable_initiator_tag = (
1556
gobject.timeout_add(
1557
int((self.expires - now).total_seconds()
1558
* 1000), self.disable))
1360
if getattr(self, "disable_initiator_tag", None) is None:
1362
# Reschedule timeout
1363
gobject.source_remove(self.disable_initiator_tag)
1364
self.disable_initiator_tag = None
1366
time_to_die = timedelta_to_milliseconds((self
1371
if time_to_die <= 0:
1372
# The timeout has passed
1375
self.expires = (datetime.datetime.utcnow()
1376
+ datetime.timedelta(milliseconds =
1378
self.disable_initiator_tag = (gobject.timeout_add
1379
(time_to_die, self.disable))
1560
1381
# ExtendedTimeout - property
1561
1382
@dbus_service_property(_interface, signature="t",
1562
1383
access="readwrite")
1563
1384
def ExtendedTimeout_dbus_property(self, value=None):
1564
1385
if value is None: # get
1565
return dbus.UInt64(self.extended_timeout.total_seconds()
1386
return dbus.UInt64(self.extended_timeout_milliseconds())
1567
1387
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1569
1389
# Interval - property
1906
1735
use_ipv6: Boolean; to use IPv6 or not
1908
1737
def __init__(self, server_address, RequestHandlerClass,
1909
interface=None, use_ipv6=True, socketfd=None):
1910
"""If socketfd is set, use that file descriptor instead of
1911
creating a new one with socket.socket().
1738
interface=None, use_ipv6=True):
1913
1739
self.interface = interface
1915
1741
self.address_family = socket.AF_INET6
1916
if socketfd is not None:
1917
# Save the file descriptor
1918
self.socketfd = socketfd
1919
# Save the original socket.socket() function
1920
self.socket_socket = socket.socket
1921
# To implement --socket, we monkey patch socket.socket.
1923
# (When socketserver.TCPServer is a new-style class, we
1924
# could make self.socket into a property instead of monkey
1925
# patching socket.socket.)
1927
# Create a one-time-only replacement for socket.socket()
1928
@functools.wraps(socket.socket)
1929
def socket_wrapper(*args, **kwargs):
1930
# Restore original function so subsequent calls are
1932
socket.socket = self.socket_socket
1933
del self.socket_socket
1934
# This time only, return a new socket object from the
1935
# saved file descriptor.
1936
return socket.fromfd(self.socketfd, *args, **kwargs)
1937
# Replace socket.socket() function with wrapper
1938
socket.socket = socket_wrapper
1939
# The socketserver.TCPServer.__init__ will call
1940
# socket.socket(), which might be our replacement,
1941
# socket_wrapper(), if socketfd was set.
1942
1742
socketserver.TCPServer.__init__(self, server_address,
1943
1743
RequestHandlerClass)
1945
1744
def server_bind(self):
1946
1745
"""This overrides the normal server_bind() function
1947
1746
to bind to an interface if one was specified, and also NOT to
1956
1755
self.socket.setsockopt(socket.SOL_SOCKET,
1957
1756
SO_BINDTODEVICE,
1958
(self.interface + "\0")
1960
1759
except socket.error as error:
1961
if error.errno == errno.EPERM:
1962
logger.error("No permission to bind to"
1963
" interface %s", self.interface)
1964
elif error.errno == errno.ENOPROTOOPT:
1760
if error[0] == errno.EPERM:
1761
logger.error("No permission to"
1762
" bind to interface %s",
1764
elif error[0] == errno.ENOPROTOOPT:
1965
1765
logger.error("SO_BINDTODEVICE not available;"
1966
1766
" cannot bind to interface %s",
1967
1767
self.interface)
1968
elif error.errno == errno.ENODEV:
1969
logger.error("Interface %s does not exist,"
1970
" cannot bind", self.interface)
1973
1770
# Only bind(2) the socket if we really need to.
2034
1830
def handle_ipc(self, source, condition, parent_pipe=None,
2035
1831
proc = None, client_object=None):
1833
gobject.IO_IN: "IN", # There is data to read.
1834
gobject.IO_OUT: "OUT", # Data can be written (without
1836
gobject.IO_PRI: "PRI", # There is urgent data to read.
1837
gobject.IO_ERR: "ERR", # Error condition.
1838
gobject.IO_HUP: "HUP" # Hung up (the connection has been
1839
# broken, usually for pipes and
1842
conditions_string = ' | '.join(name
1844
condition_names.iteritems()
1845
if cond & condition)
2036
1846
# error, or the other end of multiprocessing.Pipe has closed
2037
if condition & (gobject.IO_ERR | gobject.IO_HUP):
1847
if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
2038
1848
# Wait for other process to exit
2101
def rfc3339_duration_to_delta(duration):
2102
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
2104
>>> rfc3339_duration_to_delta("P7D")
2105
datetime.timedelta(7)
2106
>>> rfc3339_duration_to_delta("PT60S")
2107
datetime.timedelta(0, 60)
2108
>>> rfc3339_duration_to_delta("PT60M")
2109
datetime.timedelta(0, 3600)
2110
>>> rfc3339_duration_to_delta("PT24H")
2111
datetime.timedelta(1)
2112
>>> rfc3339_duration_to_delta("P1W")
2113
datetime.timedelta(7)
2114
>>> rfc3339_duration_to_delta("PT5M30S")
2115
datetime.timedelta(0, 330)
2116
>>> rfc3339_duration_to_delta("P1DT3M20S")
2117
datetime.timedelta(1, 200)
2120
# Parsing an RFC 3339 duration with regular expressions is not
2121
# possible - there would have to be multiple places for the same
2122
# values, like seconds. The current code, while more esoteric, is
2123
# cleaner without depending on a parsing library. If Python had a
2124
# built-in library for parsing we would use it, but we'd like to
2125
# avoid excessive use of external libraries.
2127
# New type for defining tokens, syntax, and semantics all-in-one
2128
Token = collections.namedtuple("Token",
2129
("regexp", # To match token; if
2130
# "value" is not None,
2131
# must have a "group"
2133
"value", # datetime.timedelta or
2135
"followers")) # Tokens valid after
2137
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2138
# the "duration" ABNF definition in RFC 3339, Appendix A.
2139
token_end = Token(re.compile(r"$"), None, frozenset())
2140
token_second = Token(re.compile(r"(\d+)S"),
2141
datetime.timedelta(seconds=1),
2142
frozenset((token_end,)))
2143
token_minute = Token(re.compile(r"(\d+)M"),
2144
datetime.timedelta(minutes=1),
2145
frozenset((token_second, token_end)))
2146
token_hour = Token(re.compile(r"(\d+)H"),
2147
datetime.timedelta(hours=1),
2148
frozenset((token_minute, token_end)))
2149
token_time = Token(re.compile(r"T"),
2151
frozenset((token_hour, token_minute,
2153
token_day = Token(re.compile(r"(\d+)D"),
2154
datetime.timedelta(days=1),
2155
frozenset((token_time, token_end)))
2156
token_month = Token(re.compile(r"(\d+)M"),
2157
datetime.timedelta(weeks=4),
2158
frozenset((token_day, token_end)))
2159
token_year = Token(re.compile(r"(\d+)Y"),
2160
datetime.timedelta(weeks=52),
2161
frozenset((token_month, token_end)))
2162
token_week = Token(re.compile(r"(\d+)W"),
2163
datetime.timedelta(weeks=1),
2164
frozenset((token_end,)))
2165
token_duration = Token(re.compile(r"P"), None,
2166
frozenset((token_year, token_month,
2167
token_day, token_time,
2169
# Define starting values
2170
value = datetime.timedelta() # Value so far
2172
followers = frozenset((token_duration,)) # Following valid tokens
2173
s = duration # String left to parse
2174
# Loop until end token is found
2175
while found_token is not token_end:
2176
# Search for any currently valid tokens
2177
for token in followers:
2178
match = token.regexp.match(s)
2179
if match is not None:
2181
if token.value is not None:
2182
# Value found, parse digits
2183
factor = int(match.group(1), 10)
2184
# Add to value so far
2185
value += factor * token.value
2186
# Strip token from string
2187
s = token.regexp.sub("", s, 1)
2190
# Set valid next tokens
2191
followers = found_token.followers
2194
# No currently valid tokens were found
2195
raise ValueError("Invalid RFC 3339 duration")
2200
1911
def string_to_delta(interval):
2201
1912
"""Parse a string and return a datetime.timedelta
2300
2005
parser.add_argument("--no-dbus", action="store_false",
2301
2006
dest="use_dbus", help="Do not provide D-Bus"
2302
" system bus interface", default=None)
2007
" system bus interface")
2303
2008
parser.add_argument("--no-ipv6", action="store_false",
2304
dest="use_ipv6", help="Do not use IPv6",
2009
dest="use_ipv6", help="Do not use IPv6")
2306
2010
parser.add_argument("--no-restore", action="store_false",
2307
2011
dest="restore", help="Do not restore stored"
2308
" state", default=None)
2309
parser.add_argument("--socket", type=int,
2310
help="Specify a file descriptor to a network"
2311
" socket to use instead of creating one")
2312
2013
parser.add_argument("--statedir", metavar="DIR",
2313
2014
help="Directory to save/restore state in")
2314
parser.add_argument("--foreground", action="store_true",
2315
help="Run in foreground", default=None)
2316
parser.add_argument("--no-zeroconf", action="store_false",
2317
dest="zeroconf", help="Do not use Zeroconf",
2320
2016
options = parser.parse_args()
2322
2018
if options.check:
2324
fail_count, test_count = doctest.testmod()
2325
sys.exit(os.EX_OK if fail_count == 0 else 1)
2327
2023
# Default values for config file for server-global settings
2328
2024
server_defaults = { "interface": "",
2350
2043
# Convert the SafeConfigParser object to a dict
2351
2044
server_settings = server_config.defaults()
2352
2045
# Use the appropriate methods on the non-string config options
2353
for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
2046
for option in ("debug", "use_dbus", "use_ipv6"):
2354
2047
server_settings[option] = server_config.getboolean("DEFAULT",
2356
2049
if server_settings["port"]:
2357
2050
server_settings["port"] = server_config.getint("DEFAULT",
2359
if server_settings["socket"]:
2360
server_settings["socket"] = server_config.getint("DEFAULT",
2362
# Later, stdin will, and stdout and stderr might, be dup'ed
2363
# over with an opened os.devnull. But we don't want this to
2364
# happen with a supplied network socket.
2365
if 0 <= server_settings["socket"] <= 2:
2366
server_settings["socket"] = os.dup(server_settings
2368
2052
del server_config
2370
2054
# Override the settings from the config file with command line
2372
2056
for option in ("interface", "address", "port", "debug",
2373
2057
"priority", "servicename", "configdir",
2374
2058
"use_dbus", "use_ipv6", "debuglevel", "restore",
2375
"statedir", "socket", "foreground", "zeroconf"):
2376
2060
value = getattr(options, option)
2377
2061
if value is not None:
2378
2062
server_settings[option] = value
2380
2064
# Force all strings to be unicode
2381
2065
for option in server_settings.keys():
2382
if isinstance(server_settings[option], bytes):
2383
server_settings[option] = (server_settings[option]
2385
# Force all boolean options to be boolean
2386
for option in ("debug", "use_dbus", "use_ipv6", "restore",
2387
"foreground", "zeroconf"):
2388
server_settings[option] = bool(server_settings[option])
2389
# Debug implies foreground
2390
if server_settings["debug"]:
2391
server_settings["foreground"] = True
2066
if type(server_settings[option]) is str:
2067
server_settings[option] = unicode(server_settings[option])
2392
2068
# Now we have our good server settings in "server_settings"
2394
2070
##################################################################
2396
if (not server_settings["zeroconf"] and
2397
not (server_settings["port"]
2398
or server_settings["socket"] != "")):
2399
parser.error("Needs port or socket to work without"
2402
2072
# For convenience
2403
2073
debug = server_settings["debug"]
2404
2074
debuglevel = server_settings["debuglevel"]
2406
2076
use_ipv6 = server_settings["use_ipv6"]
2407
2077
stored_state_path = os.path.join(server_settings["statedir"],
2408
2078
stored_state_file)
2409
foreground = server_settings["foreground"]
2410
zeroconf = server_settings["zeroconf"]
2413
initlogger(debug, logging.DEBUG)
2081
initlogger(logging.DEBUG)
2415
2083
if not debuglevel:
2418
2086
level = getattr(logging, debuglevel.upper())
2419
initlogger(debug, level)
2421
2089
if server_settings["servicename"] != "Mandos":
2422
2090
syslogger.setFormatter(logging.Formatter
2423
('Mandos ({}) [%(process)d]:'
2424
' %(levelname)s: %(message)s'
2425
.format(server_settings
2091
('Mandos (%s) [%%(process)d]:'
2092
' %%(levelname)s: %%(message)s'
2093
% server_settings["servicename"]))
2428
2095
# Parse config file with clients
2429
client_config = configparser.SafeConfigParser(Client
2096
client_config = configparser.SafeConfigParser(Client.client_defaults)
2431
2097
client_config.read(os.path.join(server_settings["configdir"],
2432
2098
"clients.conf"))
2434
2100
global mandos_dbus_service
2435
2101
mandos_dbus_service = None
2438
if server_settings["socket"] != "":
2439
socketfd = server_settings["socket"]
2440
2103
tcp_server = MandosServer((server_settings["address"],
2441
2104
server_settings["port"]),
2445
2108
use_ipv6=use_ipv6,
2446
2109
gnutls_priority=
2447
2110
server_settings["priority"],
2451
pidfilename = "/run/mandos.pid"
2452
if not os.path.isdir("/run/."):
2453
pidfilename = "/var/run/mandos.pid"
2113
pidfilename = "/var/run/mandos.pid"
2456
2115
pidfile = open(pidfilename, "w")
2457
except IOError as e:
2458
logger.error("Could not open file %r", pidfilename,
2117
logger.error("Could not open file %r", pidfilename)
2461
for name in ("_mandos", "mandos", "nobody"):
2120
uid = pwd.getpwnam("_mandos").pw_uid
2121
gid = pwd.getpwnam("_mandos").pw_gid
2463
uid = pwd.getpwnam(name).pw_uid
2464
gid = pwd.getpwnam(name).pw_gid
2124
uid = pwd.getpwnam("mandos").pw_uid
2125
gid = pwd.getpwnam("mandos").pw_gid
2466
2126
except KeyError:
2128
uid = pwd.getpwnam("nobody").pw_uid
2129
gid = pwd.getpwnam("nobody").pw_gid
2474
2136
except OSError as error:
2475
if error.errno != errno.EPERM:
2137
if error[0] != errno.EPERM:
2479
2141
# Enable all possible GnuTLS debugging
2490
2152
.gnutls_global_set_log_function(debug_gnutls))
2492
2154
# Redirect stdin so all checkers get /dev/null
2493
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2155
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2494
2156
os.dup2(null, sys.stdin.fileno())
2160
# No console logging
2161
logger.removeHandler(console)
2498
2163
# Need to fork before connecting to D-Bus
2500
2165
# Close all input and output, do double fork, etc.
2503
# multiprocessing will use threads, so before we use gobject we
2504
# need to inform gobject that threads will be used.
2505
gobject.threads_init()
2507
2168
global main_loop
2508
2169
# From the Avahi example code
2509
DBusGMainLoop(set_as_default=True)
2170
DBusGMainLoop(set_as_default=True )
2510
2171
main_loop = gobject.MainLoop()
2511
2172
bus = dbus.SystemBus()
2512
2173
# End of Avahi example code
2518
2179
("se.bsnet.fukt.Mandos", bus,
2519
2180
do_not_queue=True))
2520
2181
except dbus.exceptions.NameExistsException as e:
2521
logger.error("Disabling D-Bus:", exc_info=e)
2182
logger.error(unicode(e) + ", disabling D-Bus")
2522
2183
use_dbus = False
2523
2184
server_settings["use_dbus"] = False
2524
2185
tcp_server.use_dbus = False
2526
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2527
service = AvahiServiceToSyslog(name =
2528
server_settings["servicename"],
2529
servicetype = "_mandos._tcp",
2530
protocol = protocol, bus = bus)
2531
if server_settings["interface"]:
2532
service.interface = (if_nametoindex
2533
(server_settings["interface"]
2186
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2187
service = AvahiServiceToSyslog(name =
2188
server_settings["servicename"],
2189
servicetype = "_mandos._tcp",
2190
protocol = protocol, bus = bus)
2191
if server_settings["interface"]:
2192
service.interface = (if_nametoindex
2193
(str(server_settings["interface"])))
2536
2195
global multiprocessing_manager
2537
2196
multiprocessing_manager = multiprocessing.Manager()
2539
2198
client_class = Client
2541
client_class = functools.partial(ClientDBus, bus = bus)
2200
client_class = functools.partial(ClientDBusTransitional,
2543
2203
client_settings = Client.config_parser(client_config)
2544
2204
old_client_settings = {}
2545
2205
clients_data = {}
2547
# This is used to redirect stdout and stderr for checker processes
2549
wnull = open(os.devnull, "w") # A writable /dev/null
2550
# Only used if server is running in foreground but not in debug
2552
if debug or not foreground:
2555
2207
# Get client data and settings from last running state.
2556
2208
if server_settings["restore"]:
2560
2212
(stored_state))
2561
2213
os.remove(stored_state_path)
2562
2214
except IOError as e:
2563
if e.errno == errno.ENOENT:
2564
logger.warning("Could not load persistent state: {}"
2565
.format(os.strerror(e.errno)))
2567
logger.critical("Could not load persistent state:",
2215
logger.warning("Could not load persistent state: {0}"
2217
if e.errno != errno.ENOENT:
2570
except EOFError as e:
2571
logger.warning("Could not load persistent state: "
2572
"EOFError:", exc_info=e)
2574
2220
with PGPEngine() as pgp:
2575
for client_name, client in clients_data.items():
2576
# Skip removed clients
2577
if client_name not in client_settings:
2221
for client_name, client in clients_data.iteritems():
2580
2222
# Decide which value to use after restoring saved state.
2581
2223
# We have three different values: Old config file,
2582
2224
# new config file, and saved state.
2597
2239
# Clients who has passed its expire date can still be
2598
2240
# enabled if its last checker was successful. Clients
2599
# whose checker succeeded before we stored its state is
2600
# assumed to have successfully run all checkers during
2241
# whose checker failed before we stored its state is
2242
# assumed to have failed all checkers during downtime.
2602
2243
if client["enabled"]:
2603
2244
if datetime.datetime.utcnow() >= client["expires"]:
2604
2245
if not client["last_checked_ok"]:
2605
2246
logger.warning(
2606
"disabling client {} - Client never "
2607
"performed a successful checker"
2608
.format(client_name))
2247
"disabling client {0} - Client never "
2248
"performed a successfull checker"
2249
.format(client["name"]))
2609
2250
client["enabled"] = False
2610
2251
elif client["last_checker_status"] != 0:
2611
2252
logger.warning(
2612
"disabling client {} - Client last"
2613
" checker failed with error code {}"
2614
.format(client_name,
2253
"disabling client {0} - Client "
2254
"last checker failed with error code {1}"
2255
.format(client["name"],
2615
2256
client["last_checker_status"]))
2616
2257
client["enabled"] = False
2618
2259
client["expires"] = (datetime.datetime
2620
2261
+ client["timeout"])
2621
logger.debug("Last checker succeeded,"
2622
" keeping {} enabled"
2623
.format(client_name))
2625
2264
client["secret"] = (
2626
2265
pgp.decrypt(client["encrypted_secret"],
2629
2268
except PGPError:
2630
2269
# If decryption fails, we use secret from new settings
2631
logger.debug("Failed to decrypt {} old secret"
2270
logger.debug("Failed to decrypt {0} old secret"
2632
2271
.format(client_name))
2633
2272
client["secret"] = (
2634
2273
client_settings[client_name]["secret"])
2636
2276
# Add/remove clients based on new changes made to config
2637
for client_name in (set(old_client_settings)
2638
- set(client_settings)):
2277
for client_name in set(old_client_settings) - set(client_settings):
2639
2278
del clients_data[client_name]
2640
for client_name in (set(client_settings)
2641
- set(old_client_settings)):
2279
for client_name in set(client_settings) - set(old_client_settings):
2642
2280
clients_data[client_name] = client_settings[client_name]
2644
# Create all client objects
2645
for client_name, client in clients_data.items():
2282
# Create clients all clients
2283
for client_name, client in clients_data.iteritems():
2646
2284
tcp_server.clients[client_name] = client_class(
2647
name = client_name, settings = client,
2648
server_settings = server_settings)
2285
name = client_name, settings = client)
2650
2287
if not tcp_server.clients:
2651
2288
logger.warning("No clients defined")
2654
if pidfile is not None:
2658
pidfile.write("{}\n".format(pid).encode("utf-8"))
2660
logger.error("Could not write to file %r with PID %d",
2294
pidfile.write(str(pid) + "\n".encode("utf-8"))
2297
logger.error("Could not write to file %r with PID %d",
2300
# "pidfile" was never created
2663
2302
del pidfilename
2303
signal.signal(signal.SIGINT, signal.SIG_IGN)
2665
2305
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2666
2306
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2669
@alternate_dbus_interfaces({"se.recompile.Mandos":
2670
"se.bsnet.fukt.Mandos"})
2671
class MandosDBusService(DBusObjectWithProperties):
2309
class MandosDBusService(dbus.service.Object):
2672
2310
"""A D-Bus proxy object"""
2673
2311
def __init__(self):
2674
2312
dbus.service.Object.__init__(self, bus, "/")
2675
2313
_interface = "se.recompile.Mandos"
2677
@dbus_interface_annotations(_interface)
2679
return { "org.freedesktop.DBus.Property"
2680
".EmitsChangedSignal":
2683
2315
@dbus.service.signal(_interface, signature="o")
2684
2316
def ClientAdded(self, objpath):
2768
2400
del client_settings[client.name]["secret"]
2771
with (tempfile.NamedTemporaryFile
2772
(mode='wb', suffix=".pickle", prefix='clients-',
2773
dir=os.path.dirname(stored_state_path),
2774
delete=False)) as stored_state:
2403
with os.fdopen(os.open(stored_state_path,
2404
os.O_CREAT|os.O_WRONLY|os.O_TRUNC,
2405
0600), "wb") as stored_state:
2775
2406
pickle.dump((clients, client_settings), stored_state)
2776
tempname=stored_state.name
2777
os.rename(tempname, stored_state_path)
2778
2407
except (IOError, OSError) as e:
2784
if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2785
logger.warning("Could not save persistent state: {}"
2786
.format(os.strerror(e.errno)))
2788
logger.warning("Could not save persistent state:",
2408
logger.warning("Could not save persistent state: {0}"
2410
if e.errno not in (errno.ENOENT, errno.EACCES):
2792
2413
# Delete all clients, and settings from config
2817
2438
tcp_server.server_activate()
2819
2440
# Find out what port we got
2821
service.port = tcp_server.socket.getsockname()[1]
2441
service.port = tcp_server.socket.getsockname()[1]
2823
2443
logger.info("Now listening on address %r, port %d,"
2824
" flowinfo %d, scope_id %d",
2825
*tcp_server.socket.getsockname())
2444
" flowinfo %d, scope_id %d"
2445
% tcp_server.socket.getsockname())
2827
logger.info("Now listening on address %r, port %d",
2828
*tcp_server.socket.getsockname())
2447
logger.info("Now listening on address %r, port %d"
2448
% tcp_server.socket.getsockname())
2830
2450
#service.interface = tcp_server.socket.getsockname()[3]
2834
# From the Avahi example code
2837
except dbus.exceptions.DBusException as error:
2838
logger.critical("D-Bus Exception", exc_info=error)
2841
# End of Avahi example code
2453
# From the Avahi example code
2456
except dbus.exceptions.DBusException as error:
2457
logger.critical("DBusException: %s", error)
2460
# End of Avahi example code
2843
2462
gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2844
2463
lambda *args, **kwargs: