101
80
except ImportError:
102
81
SO_BINDTODEVICE = None
104
if sys.version_info.major == 2:
108
stored_state_file = "clients.pickle"
110
logger = logging.getLogger()
114
if_nametoindex = ctypes.cdll.LoadLibrary(
115
ctypes.util.find_library("c")).if_nametoindex
116
except (OSError, AttributeError):
118
def if_nametoindex(interface):
119
"Get an interface index the hard way, i.e. using fcntl()"
120
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
121
with contextlib.closing(socket.socket()) as s:
122
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
123
struct.pack(b"16s16x", interface))
124
interface_index = struct.unpack("I", ifreq[16:20])[0]
125
return interface_index
128
def initlogger(debug, level=logging.WARNING):
129
"""init logger and add loglevel"""
132
syslogger = (logging.handlers.SysLogHandler(
133
facility = logging.handlers.SysLogHandler.LOG_DAEMON,
134
address = "/dev/log"))
135
syslogger.setFormatter(logging.Formatter
136
('Mandos [%(process)d]: %(levelname)s:'
138
logger.addHandler(syslogger)
141
console = logging.StreamHandler()
142
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
146
logger.addHandler(console)
147
logger.setLevel(level)
150
class PGPError(Exception):
151
"""Exception if encryption/decryption fails"""
155
class PGPEngine(object):
156
"""A simple class for OpenPGP symmetric encryption & decryption"""
159
self.tempdir = tempfile.mkdtemp(prefix="mandos-")
160
self.gnupgargs = ['--batch',
161
'--home', self.tempdir,
169
def __exit__(self, exc_type, exc_value, traceback):
177
if self.tempdir is not None:
178
# Delete contents of tempdir
179
for root, dirs, files in os.walk(self.tempdir,
181
for filename in files:
182
os.remove(os.path.join(root, filename))
184
os.rmdir(os.path.join(root, dirname))
186
os.rmdir(self.tempdir)
189
def password_encode(self, password):
190
# Passphrase can not be empty and can not contain newlines or
191
# NUL bytes. So we prefix it and hex encode it.
192
encoded = b"mandos" + binascii.hexlify(password)
193
if len(encoded) > 2048:
194
# GnuPG can't handle long passwords, so encode differently
195
encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
196
.replace(b"\n", b"\\n")
197
.replace(b"\0", b"\\x00"))
200
def encrypt(self, data, password):
201
passphrase = self.password_encode(password)
202
with tempfile.NamedTemporaryFile(
203
dir=self.tempdir) as passfile:
204
passfile.write(passphrase)
206
proc = subprocess.Popen(['gpg', '--symmetric',
210
stdin = subprocess.PIPE,
211
stdout = subprocess.PIPE,
212
stderr = subprocess.PIPE)
213
ciphertext, err = proc.communicate(input = data)
214
if proc.returncode != 0:
218
def decrypt(self, data, password):
219
passphrase = self.password_encode(password)
220
with tempfile.NamedTemporaryFile(
221
dir = self.tempdir) as passfile:
222
passfile.write(passphrase)
224
proc = subprocess.Popen(['gpg', '--decrypt',
228
stdin = subprocess.PIPE,
229
stdout = subprocess.PIPE,
230
stderr = subprocess.PIPE)
231
decrypted_plaintext, err = proc.communicate(input = data)
232
if proc.returncode != 0:
234
return decrypted_plaintext
86
#logger = logging.getLogger(u'mandos')
87
logger = logging.Logger(u'mandos')
88
syslogger = (logging.handlers.SysLogHandler
89
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
90
address = "/dev/log"))
91
syslogger.setFormatter(logging.Formatter
92
(u'Mandos [%(process)d]: %(levelname)s:'
94
logger.addHandler(syslogger)
96
console = logging.StreamHandler()
97
console.setFormatter(logging.Formatter(u'%(name)s [%(process)d]:'
100
logger.addHandler(console)
237
102
class AvahiError(Exception):
238
103
def __init__(self, value, *args, **kwargs):
239
104
self.value = value
240
return super(AvahiError, self).__init__(value, *args,
105
super(AvahiError, self).__init__(value, *args, **kwargs)
106
def __unicode__(self):
107
return unicode(repr(self.value))
244
109
class AvahiServiceError(AvahiError):
248
112
class AvahiGroupError(AvahiError):
352
197
dbus.UInt16(self.port),
353
198
avahi.string_array_to_txt_array(self.TXT))
354
199
self.group.Commit()
356
200
def entry_group_state_changed(self, state, error):
357
201
"""Derived from the Avahi example code"""
358
logger.debug("Avahi entry group state change: %i", state)
202
logger.debug(u"Avahi entry group state change: %i", state)
360
204
if state == avahi.ENTRY_GROUP_ESTABLISHED:
361
logger.debug("Zeroconf service established.")
205
logger.debug(u"Zeroconf service established.")
362
206
elif state == avahi.ENTRY_GROUP_COLLISION:
363
logger.info("Zeroconf service name collision.")
207
logger.warning(u"Zeroconf service name collision.")
365
209
elif state == avahi.ENTRY_GROUP_FAILURE:
366
logger.critical("Avahi: Error in group state changed %s",
368
raise AvahiGroupError("State changed: {!s}".format(error))
210
logger.critical(u"Avahi: Error in group state changed %s",
212
raise AvahiGroupError(u"State changed: %s"
370
214
def cleanup(self):
371
215
"""Derived from the Avahi example code"""
372
216
if self.group is not None:
375
except (dbus.exceptions.UnknownMethodException,
376
dbus.exceptions.DBusException):
378
218
self.group = None
381
def server_state_changed(self, state, error=None):
219
def server_state_changed(self, state):
382
220
"""Derived from the Avahi example code"""
383
logger.debug("Avahi server state change: %i", state)
385
avahi.SERVER_INVALID: "Zeroconf server invalid",
386
avahi.SERVER_REGISTERING: None,
387
avahi.SERVER_COLLISION: "Zeroconf server name collision",
388
avahi.SERVER_FAILURE: "Zeroconf server failure",
390
if state in bad_states:
391
if bad_states[state] is not None:
393
logger.error(bad_states[state])
395
logger.error(bad_states[state] + ": %r", error)
221
logger.debug(u"Avahi server state change: %i", state)
222
if state == avahi.SERVER_COLLISION:
223
logger.error(u"Zeroconf server name collision")
397
225
elif state == avahi.SERVER_RUNNING:
401
logger.debug("Unknown state: %r", state)
403
logger.debug("Unknown state: %r: %r", state, error)
405
227
def activate(self):
406
228
"""Derived from the Avahi example code"""
407
229
if self.server is None:
408
230
self.server = dbus.Interface(
409
231
self.bus.get_object(avahi.DBUS_NAME,
410
avahi.DBUS_PATH_SERVER,
411
follow_name_owner_changes=True),
232
avahi.DBUS_PATH_SERVER),
412
233
avahi.DBUS_INTERFACE_SERVER)
413
self.server.connect_to_signal("StateChanged",
414
self.server_state_changed)
234
self.server.connect_to_signal(u"StateChanged",
235
self.server_state_changed)
415
236
self.server_state_changed(self.server.GetState())
418
class AvahiServiceToSyslog(AvahiService):
419
def rename(self, *args, **kwargs):
420
"""Add the new name to the syslog messages"""
421
ret = AvahiService.rename(self, *args, **kwargs)
422
syslogger.setFormatter(logging.Formatter(
423
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
428
239
class Client(object):
429
240
"""A representation of a client host served by this server.
432
approved: bool(); 'None' if not yet approved/disapproved
433
approval_delay: datetime.timedelta(); Time to wait for approval
434
approval_duration: datetime.timedelta(); Duration of one approval
243
name: string; from the config file, used in log messages and
245
fingerprint: string (40 or 32 hexadecimal digits); used to
246
uniquely identify the client
247
secret: bytestring; sent verbatim (over TLS) to client
248
host: string; available for use by the checker command
249
created: datetime.datetime(); (UTC) object creation
250
last_enabled: datetime.datetime(); (UTC)
252
last_checked_ok: datetime.datetime(); (UTC) or None
253
timeout: datetime.timedelta(); How long from last_checked_ok
254
until this client is disabled
255
interval: datetime.timedelta(); How often to start a new checker
256
disable_hook: If set, called by disable() as disable_hook(self)
435
257
checker: subprocess.Popen(); a running checker process used
436
258
to see if the client lives.
437
259
'None' if no process is running.
438
checker_callback_tag: a gobject event source tag, or None
439
checker_command: string; External command which is run to check
440
if client lives. %() expansions are done at
260
checker_initiator_tag: a gobject event source tag, or None
261
disable_initiator_tag: - '' -
262
checker_callback_tag: - '' -
263
checker_command: string; External command which is run to check if
264
client lives. %() expansions are done at
441
265
runtime with vars(self) as dict, so that for
442
266
instance %(name)s can be used in the command.
443
checker_initiator_tag: a gobject event source tag, or None
444
created: datetime.datetime(); (UTC) object creation
445
client_structure: Object describing what attributes a client has
446
and is used for storing the client at exit
447
267
current_checker_command: string; current running checker_command
448
disable_initiator_tag: a gobject event source tag, or None
450
fingerprint: string (40 or 32 hexadecimal digits); used to
451
uniquely identify the client
452
host: string; available for use by the checker command
453
interval: datetime.timedelta(); How often to start a new checker
454
last_approval_request: datetime.datetime(); (UTC) or None
455
last_checked_ok: datetime.datetime(); (UTC) or None
456
last_checker_status: integer between 0 and 255 reflecting exit
457
status of last checker. -1 reflects crashed
458
checker, -2 means no checker completed yet.
459
last_enabled: datetime.datetime(); (UTC) or None
460
name: string; from the config file, used in log messages and
462
secret: bytestring; sent verbatim (over TLS) to client
463
timeout: datetime.timedelta(); How long from last_checked_ok
464
until this client is disabled
465
extended_timeout: extra long timeout when secret has been sent
466
runtime_expansions: Allowed attributes for runtime expansion.
467
expires: datetime.datetime(); time (UTC) when a client will be
469
server_settings: The server_settings dict from main()
268
approval_delay: datetime.timedelta(); Time to wait for approval
269
_approved: bool(); 'None' if not yet approved/disapproved
270
approval_duration: datetime.timedelta(); Duration of one approval
472
runtime_expansions = ("approval_delay", "approval_duration",
473
"created", "enabled", "expires",
474
"fingerprint", "host", "interval",
475
"last_approval_request", "last_checked_ok",
476
"last_enabled", "name", "timeout")
479
"extended_timeout": "PT15M",
481
"checker": "fping -q -- %%(host)s",
483
"approval_delay": "PT0S",
484
"approval_duration": "PT1S",
485
"approved_by_default": "True",
490
def config_parser(config):
491
"""Construct a new dict of client settings of this form:
492
{ client_name: {setting_name: value, ...}, ...}
493
with exceptions for any special settings as defined above.
494
NOTE: Must be a pure function. Must return the same result
495
value given the same arguments.
498
for client_name in config.sections():
499
section = dict(config.items(client_name))
500
client = settings[client_name] = {}
502
client["host"] = section["host"]
503
# Reformat values from string types to Python types
504
client["approved_by_default"] = config.getboolean(
505
client_name, "approved_by_default")
506
client["enabled"] = config.getboolean(client_name,
509
# Uppercase and remove spaces from fingerprint for later
510
# comparison purposes with return value from the
511
# fingerprint() function
512
client["fingerprint"] = (section["fingerprint"].upper()
514
if "secret" in section:
515
client["secret"] = section["secret"].decode("base64")
516
elif "secfile" in section:
517
with open(os.path.expanduser(os.path.expandvars
518
(section["secfile"])),
520
client["secret"] = secfile.read()
522
raise TypeError("No secret or secfile for section {}"
524
client["timeout"] = string_to_delta(section["timeout"])
525
client["extended_timeout"] = string_to_delta(
526
section["extended_timeout"])
527
client["interval"] = string_to_delta(section["interval"])
528
client["approval_delay"] = string_to_delta(
529
section["approval_delay"])
530
client["approval_duration"] = string_to_delta(
531
section["approval_duration"])
532
client["checker_command"] = section["checker"]
533
client["last_approval_request"] = None
534
client["last_checked_ok"] = None
535
client["last_checker_status"] = -2
539
def __init__(self, settings, name = None, server_settings=None):
274
def _timedelta_to_milliseconds(td):
275
"Convert a datetime.timedelta() to milliseconds"
276
return ((td.days * 24 * 60 * 60 * 1000)
277
+ (td.seconds * 1000)
278
+ (td.microseconds // 1000))
280
def timeout_milliseconds(self):
281
"Return the 'timeout' attribute in milliseconds"
282
return self._timedelta_to_milliseconds(self.timeout)
284
def interval_milliseconds(self):
285
"Return the 'interval' attribute in milliseconds"
286
return self._timedelta_to_milliseconds(self.interval)
288
def approval_delay_milliseconds(self):
289
return self._timedelta_to_milliseconds(self.approval_delay)
291
def __init__(self, name = None, disable_hook=None, config=None):
292
"""Note: the 'checker' key in 'config' sets the
293
'checker_command' attribute and *not* the 'checker'
541
if server_settings is None:
543
self.server_settings = server_settings
544
# adding all client settings
545
for setting, value in settings.items():
546
setattr(self, setting, value)
549
if not hasattr(self, "last_enabled"):
550
self.last_enabled = datetime.datetime.utcnow()
551
if not hasattr(self, "expires"):
552
self.expires = (datetime.datetime.utcnow()
298
logger.debug(u"Creating client %r", self.name)
299
# Uppercase and remove spaces from fingerprint for later
300
# comparison purposes with return value from the fingerprint()
302
self.fingerprint = (config[u"fingerprint"].upper()
304
logger.debug(u" Fingerprint: %s", self.fingerprint)
305
if u"secret" in config:
306
self.secret = config[u"secret"].decode(u"base64")
307
elif u"secfile" in config:
308
with open(os.path.expanduser(os.path.expandvars
309
(config[u"secfile"])),
311
self.secret = secfile.read()
555
self.last_enabled = None
558
logger.debug("Creating client %r", self.name)
559
logger.debug(" Fingerprint: %s", self.fingerprint)
560
self.created = settings.get("created",
561
datetime.datetime.utcnow())
563
# attributes specific for this server instance
313
raise TypeError(u"No secret or secfile for client %s"
315
self.host = config.get(u"host", u"")
316
self.created = datetime.datetime.utcnow()
318
self.last_enabled = None
319
self.last_checked_ok = None
320
self.timeout = string_to_delta(config[u"timeout"])
321
self.interval = string_to_delta(config[u"interval"])
322
self.disable_hook = disable_hook
564
323
self.checker = None
565
324
self.checker_initiator_tag = None
566
325
self.disable_initiator_tag = None
567
326
self.checker_callback_tag = None
327
self.checker_command = config[u"checker"]
568
328
self.current_checker_command = None
329
self.last_connect = None
330
self._approved = None
331
self.approved_by_default = config.get(u"approved_by_default",
570
333
self.approvals_pending = 0
571
self.changedstate = multiprocessing_manager.Condition(
572
multiprocessing_manager.Lock())
573
self.client_structure = [attr
574
for attr in self.__dict__.iterkeys()
575
if not attr.startswith("_")]
576
self.client_structure.append("client_structure")
578
for name, t in inspect.getmembers(
579
type(self), lambda obj: isinstance(obj, property)):
580
if not name.startswith("_"):
581
self.client_structure.append(name)
334
self.approval_delay = string_to_delta(
335
config[u"approval_delay"])
336
self.approval_duration = string_to_delta(
337
config[u"approval_duration"])
338
self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
583
# Send notice to process children that client state has changed
584
340
def send_changedstate(self):
585
with self.changedstate:
586
self.changedstate.notify_all()
341
self.changedstate.acquire()
342
self.changedstate.notify_all()
343
self.changedstate.release()
588
345
def enable(self):
589
346
"""Start this client's checker and timeout hooks"""
590
if getattr(self, "enabled", False):
347
if getattr(self, u"enabled", False):
591
348
# Already enabled
593
self.expires = datetime.datetime.utcnow() + self.timeout
350
self.send_changedstate()
595
351
self.last_enabled = datetime.datetime.utcnow()
597
self.send_changedstate()
352
# Schedule a new checker to be started an 'interval' from now,
353
# and every interval from then on.
354
self.checker_initiator_tag = (gobject.timeout_add
355
(self.interval_milliseconds(),
357
# Schedule a disable() when 'timeout' has passed
358
self.disable_initiator_tag = (gobject.timeout_add
359
(self.timeout_milliseconds(),
362
# Also start a new checker *right now*.
599
365
def disable(self, quiet=True):
600
366
"""Disable this client."""
601
367
if not getattr(self, "enabled", False):
604
logger.info("Disabling client %s", self.name)
605
if getattr(self, "disable_initiator_tag", None) is not None:
370
self.send_changedstate()
372
logger.info(u"Disabling client %s", self.name)
373
if getattr(self, u"disable_initiator_tag", False):
606
374
gobject.source_remove(self.disable_initiator_tag)
607
375
self.disable_initiator_tag = None
609
if getattr(self, "checker_initiator_tag", None) is not None:
376
if getattr(self, u"checker_initiator_tag", False):
610
377
gobject.source_remove(self.checker_initiator_tag)
611
378
self.checker_initiator_tag = None
612
379
self.stop_checker()
380
if self.disable_hook:
381
self.disable_hook(self)
613
382
self.enabled = False
615
self.send_changedstate()
616
383
# Do not run this again if called by a gobject.timeout_add
619
386
def __del__(self):
387
self.disable_hook = None
622
def init_checker(self):
623
# Schedule a new checker to be started an 'interval' from now,
624
# and every interval from then on.
625
if self.checker_initiator_tag is not None:
626
gobject.source_remove(self.checker_initiator_tag)
627
self.checker_initiator_tag = gobject.timeout_add(
628
int(self.interval.total_seconds() * 1000),
630
# Schedule a disable() when 'timeout' has passed
631
if self.disable_initiator_tag is not None:
632
gobject.source_remove(self.disable_initiator_tag)
633
self.disable_initiator_tag = gobject.timeout_add(
634
int(self.timeout.total_seconds() * 1000), self.disable)
635
# Also start a new checker *right now*.
638
390
def checker_callback(self, pid, condition, command):
639
391
"""The checker has completed, so take appropriate actions."""
640
392
self.checker_callback_tag = None
641
393
self.checker = None
642
394
if os.WIFEXITED(condition):
643
self.last_checker_status = os.WEXITSTATUS(condition)
644
if self.last_checker_status == 0:
645
logger.info("Checker for %(name)s succeeded",
395
exitstatus = os.WEXITSTATUS(condition)
397
logger.info(u"Checker for %(name)s succeeded",
647
399
self.checked_ok()
649
logger.info("Checker for %(name)s failed", vars(self))
401
logger.info(u"Checker for %(name)s failed",
651
self.last_checker_status = -1
652
logger.warning("Checker for %(name)s crashed?",
404
logger.warning(u"Checker for %(name)s crashed?",
655
407
def checked_ok(self):
656
"""Assert that the client has been seen, alive and well."""
408
"""Bump up the timeout for this client.
410
This should only be called when the client has been seen,
657
413
self.last_checked_ok = datetime.datetime.utcnow()
658
self.last_checker_status = 0
661
def bump_timeout(self, timeout=None):
662
"""Bump up the timeout for this client."""
664
timeout = self.timeout
665
if self.disable_initiator_tag is not None:
666
gobject.source_remove(self.disable_initiator_tag)
667
self.disable_initiator_tag = None
668
if getattr(self, "enabled", False):
669
self.disable_initiator_tag = gobject.timeout_add(
670
int(timeout.total_seconds() * 1000), self.disable)
671
self.expires = datetime.datetime.utcnow() + timeout
673
def need_approval(self):
674
self.last_approval_request = datetime.datetime.utcnow()
414
gobject.source_remove(self.disable_initiator_tag)
415
self.disable_initiator_tag = (gobject.timeout_add
416
(self.timeout_milliseconds(),
676
419
def start_checker(self):
677
420
"""Start a new checker subprocess if one is not running.
690
433
# If a checker exists, make sure it is not a zombie
692
435
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
693
except AttributeError:
695
except OSError as error:
696
if error.errno != errno.ECHILD:
436
except (AttributeError, OSError), error:
437
if (isinstance(error, OSError)
438
and error.errno != errno.ECHILD):
700
logger.warning("Checker was a zombie")
442
logger.warning(u"Checker was a zombie")
701
443
gobject.source_remove(self.checker_callback_tag)
702
444
self.checker_callback(pid, status,
703
445
self.current_checker_command)
704
446
# Start a new checker if needed
705
447
if self.checker is None:
706
# Escape attributes for the shell
708
attr: re.escape(str(getattr(self, attr)))
709
for attr in self.runtime_expansions }
711
command = self.checker_command % escaped_attrs
712
except TypeError as error:
713
logger.error('Could not format string "%s"',
714
self.checker_command,
716
return True # Try again later
449
# In case checker_command has exactly one % operator
450
command = self.checker_command % self.host
452
# Escape attributes for the shell
453
escaped_attrs = dict((key,
454
re.escape(unicode(str(val),
458
vars(self).iteritems())
460
command = self.checker_command % escaped_attrs
461
except TypeError, error:
462
logger.error(u'Could not format string "%s":'
463
u' %s', self.checker_command, error)
464
return True # Try again later
717
465
self.current_checker_command = command
719
logger.info("Starting checker %r for %s", command,
467
logger.info(u"Starting checker %r for %s",
721
469
# We don't need to redirect stdout and stderr, since
722
470
# in normal mode, that is already done by daemon(),
723
471
# and in debug mode we don't want to. (Stdin is
724
472
# always replaced by /dev/null.)
725
# The exception is when not debugging but nevertheless
726
# running in the foreground; use the previously
729
if (not self.server_settings["debug"]
730
and self.server_settings["foreground"]):
731
popen_args.update({"stdout": wnull,
733
473
self.checker = subprocess.Popen(command,
738
except OSError as error:
739
logger.error("Failed to start subprocess",
742
self.checker_callback_tag = gobject.child_watch_add(
743
self.checker.pid, self.checker_callback, data=command)
744
# The checker may have completed before the gobject
745
# watch was added. Check for this.
475
shell=True, cwd=u"/")
476
self.checker_callback_tag = (gobject.child_watch_add
478
self.checker_callback,
480
# The checker may have completed before the gobject
481
# watch was added. Check for this.
747
482
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
748
except OSError as error:
749
if error.errno == errno.ECHILD:
750
# This should never happen
751
logger.error("Child process vanished",
756
gobject.source_remove(self.checker_callback_tag)
757
self.checker_callback(pid, status, command)
484
gobject.source_remove(self.checker_callback_tag)
485
self.checker_callback(pid, status, command)
486
except OSError, error:
487
logger.error(u"Failed to start subprocess: %s",
758
489
# Re-run this periodically if run by gobject.timeout_add
873
559
class DBusObjectWithProperties(dbus.service.Object):
874
560
"""A D-Bus object with properties.
876
562
Classes inheriting from this can use the dbus_service_property
877
563
decorator to expose methods as D-Bus properties. It exposes the
878
564
standard Get(), Set(), and GetAll() methods on the D-Bus.
882
def _is_dbus_thing(thing):
883
"""Returns a function testing if an attribute is a D-Bus thing
885
If called like _is_dbus_thing("method") it returns a function
886
suitable for use as predicate to inspect.getmembers().
888
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
568
def _is_dbus_property(obj):
569
return getattr(obj, u"_dbus_is_property", False)
891
def _get_all_dbus_things(self, thing):
571
def _get_all_dbus_properties(self):
892
572
"""Returns a generator of (name, attribute) pairs
894
return ((getattr(athing.__get__(self), "_dbus_name", name),
895
athing.__get__(self))
896
for cls in self.__class__.__mro__
898
inspect.getmembers(cls, self._is_dbus_thing(thing)))
574
return ((prop._dbus_name, prop)
576
inspect.getmembers(self, self._is_dbus_property))
900
578
def _get_dbus_property(self, interface_name, property_name):
901
579
"""Returns a bound method if one exists which is a D-Bus
902
580
property with the specified name and interface.
904
for cls in self.__class__.__mro__:
905
for name, value in inspect.getmembers(
906
cls, self._is_dbus_thing("property")):
907
if (value._dbus_name == property_name
908
and value._dbus_interface == interface_name):
909
return value.__get__(self)
582
for name in (property_name,
583
property_name + u"_dbus_property"):
584
prop = getattr(self, name, None)
586
or not self._is_dbus_property(prop)
587
or prop._dbus_name != property_name
588
or (interface_name and prop._dbus_interface
589
and interface_name != prop._dbus_interface)):
911
592
# No such property
912
raise DBusPropertyNotFound("{}:{}.{}".format(
913
self.dbus_object_path, interface_name, property_name))
593
raise DBusPropertyNotFound(self.dbus_object_path + u":"
594
+ interface_name + u"."
915
@dbus.service.method(dbus.PROPERTIES_IFACE,
597
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ss",
918
599
def Get(self, interface_name, property_name):
919
600
"""Standard D-Bus property Get() method, see D-Bus standard.
921
602
prop = self._get_dbus_property(interface_name, property_name)
922
if prop._dbus_access == "write":
603
if prop._dbus_access == u"write":
923
604
raise DBusPropertyAccessException(property_name)
925
if not hasattr(value, "variant_level"):
606
if not hasattr(value, u"variant_level"):
927
608
return type(value)(value, variant_level=value.variant_level+1)
929
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
610
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ssv")
930
611
def Set(self, interface_name, property_name, value):
931
612
"""Standard D-Bus property Set() method, see D-Bus standard.
933
614
prop = self._get_dbus_property(interface_name, property_name)
934
if prop._dbus_access == "read":
615
if prop._dbus_access == u"read":
935
616
raise DBusPropertyAccessException(property_name)
936
if prop._dbus_get_args_options["byte_arrays"]:
617
if prop._dbus_get_args_options[u"byte_arrays"]:
937
618
# The byte_arrays option is not supported yet on
938
619
# signatures other than "ay".
939
if prop._dbus_signature != "ay":
940
raise ValueError("Byte arrays not supported for non-"
941
"'ay' signature {!r}"
942
.format(prop._dbus_signature))
943
value = dbus.ByteArray(b''.join(chr(byte)
620
if prop._dbus_signature != u"ay":
622
value = dbus.ByteArray(''.join(unichr(byte)
947
@dbus.service.method(dbus.PROPERTIES_IFACE,
949
out_signature="a{sv}")
626
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"s",
627
out_signature=u"a{sv}")
950
628
def GetAll(self, interface_name):
951
629
"""Standard D-Bus property GetAll() method, see D-Bus
954
632
Note: Will not include properties with access="write".
957
for name, prop in self._get_all_dbus_things("property"):
635
for name, prop in self._get_all_dbus_properties():
958
636
if (interface_name
959
637
and interface_name != prop._dbus_interface):
960
638
# Interface non-empty but did not match
962
640
# Ignore write-only properties
963
if prop._dbus_access == "write":
641
if prop._dbus_access == u"write":
966
if not hasattr(value, "variant_level"):
967
properties[name] = value
644
if not hasattr(value, u"variant_level"):
969
properties[name] = type(value)(
970
value, variant_level = value.variant_level + 1)
971
return dbus.Dictionary(properties, signature="sv")
973
@dbus.service.signal(dbus.PROPERTIES_IFACE, signature="sa{sv}as")
974
def PropertiesChanged(self, interface_name, changed_properties,
975
invalidated_properties):
976
"""Standard D-Bus PropertiesChanged() signal, see D-Bus
647
all[name] = type(value)(value, variant_level=
648
value.variant_level+1)
649
return dbus.Dictionary(all, signature=u"sv")
981
651
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
983
653
path_keyword='object_path',
984
654
connection_keyword='connection')
985
655
def Introspect(self, object_path, connection):
986
"""Overloading of standard D-Bus method.
988
Inserts property tags and interface annotation tags.
656
"""Standard D-Bus method, overloaded to insert property tags.
990
658
xmlstring = dbus.service.Object.Introspect(self, object_path,
993
661
document = xml.dom.minidom.parseString(xmlstring)
995
662
def make_tag(document, name, prop):
996
e = document.createElement("property")
997
e.setAttribute("name", name)
998
e.setAttribute("type", prop._dbus_signature)
999
e.setAttribute("access", prop._dbus_access)
663
e = document.createElement(u"property")
664
e.setAttribute(u"name", name)
665
e.setAttribute(u"type", prop._dbus_signature)
666
e.setAttribute(u"access", prop._dbus_access)
1002
for if_tag in document.getElementsByTagName("interface"):
668
for if_tag in document.getElementsByTagName(u"interface"):
1004
669
for tag in (make_tag(document, name, prop)
1006
in self._get_all_dbus_things("property")
671
in self._get_all_dbus_properties()
1007
672
if prop._dbus_interface
1008
== if_tag.getAttribute("name")):
673
== if_tag.getAttribute(u"name")):
1009
674
if_tag.appendChild(tag)
1010
# Add annotation tags
1011
for typ in ("method", "signal", "property"):
1012
for tag in if_tag.getElementsByTagName(typ):
1014
for name, prop in (self.
1015
_get_all_dbus_things(typ)):
1016
if (name == tag.getAttribute("name")
1017
and prop._dbus_interface
1018
== if_tag.getAttribute("name")):
1019
annots.update(getattr(
1020
prop, "_dbus_annotations", {}))
1021
for name, value in annots.items():
1022
ann_tag = document.createElement(
1024
ann_tag.setAttribute("name", name)
1025
ann_tag.setAttribute("value", value)
1026
tag.appendChild(ann_tag)
1027
# Add interface annotation tags
1028
for annotation, value in dict(
1029
itertools.chain.from_iterable(
1030
annotations().items()
1031
for name, annotations
1032
in self._get_all_dbus_things("interface")
1033
if name == if_tag.getAttribute("name")
1035
ann_tag = document.createElement("annotation")
1036
ann_tag.setAttribute("name", annotation)
1037
ann_tag.setAttribute("value", value)
1038
if_tag.appendChild(ann_tag)
1039
675
# Add the names to the return values for the
1040
676
# "org.freedesktop.DBus.Properties" methods
1041
if (if_tag.getAttribute("name")
1042
== "org.freedesktop.DBus.Properties"):
1043
for cn in if_tag.getElementsByTagName("method"):
1044
if cn.getAttribute("name") == "Get":
1045
for arg in cn.getElementsByTagName("arg"):
1046
if (arg.getAttribute("direction")
1048
arg.setAttribute("name", "value")
1049
elif cn.getAttribute("name") == "GetAll":
1050
for arg in cn.getElementsByTagName("arg"):
1051
if (arg.getAttribute("direction")
1053
arg.setAttribute("name", "props")
1054
xmlstring = document.toxml("utf-8")
677
if (if_tag.getAttribute(u"name")
678
== u"org.freedesktop.DBus.Properties"):
679
for cn in if_tag.getElementsByTagName(u"method"):
680
if cn.getAttribute(u"name") == u"Get":
681
for arg in cn.getElementsByTagName(u"arg"):
682
if (arg.getAttribute(u"direction")
684
arg.setAttribute(u"name", u"value")
685
elif cn.getAttribute(u"name") == u"GetAll":
686
for arg in cn.getElementsByTagName(u"arg"):
687
if (arg.getAttribute(u"direction")
689
arg.setAttribute(u"name", u"props")
690
xmlstring = document.toxml(u"utf-8")
1055
691
document.unlink()
1056
692
except (AttributeError, xml.dom.DOMException,
1057
xml.parsers.expat.ExpatError) as error:
1058
logger.error("Failed to override Introspection method",
693
xml.parsers.expat.ExpatError), error:
694
logger.error(u"Failed to override Introspection method",
1060
696
return xmlstring
1063
def datetime_to_dbus(dt, variant_level=0):
1064
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1066
return dbus.String("", variant_level = variant_level)
1067
return dbus.String(dt.isoformat(), variant_level=variant_level)
1070
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1071
"""A class decorator; applied to a subclass of
1072
dbus.service.Object, it will add alternate D-Bus attributes with
1073
interface names according to the "alt_interface_names" mapping.
1076
@alternate_dbus_interfaces({"org.example.Interface":
1077
"net.example.AlternateInterface"})
1078
class SampleDBusObject(dbus.service.Object):
1079
@dbus.service.method("org.example.Interface")
1080
def SampleDBusMethod():
1083
The above "SampleDBusMethod" on "SampleDBusObject" will be
1084
reachable via two interfaces: "org.example.Interface" and
1085
"net.example.AlternateInterface", the latter of which will have
1086
its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
1087
"true", unless "deprecate" is passed with a False value.
1089
This works for methods and signals, and also for D-Bus properties
1090
(from DBusObjectWithProperties) and interfaces (from the
1091
dbus_interface_annotations decorator).
1095
for orig_interface_name, alt_interface_name in (
1096
alt_interface_names.items()):
1098
interface_names = set()
1099
# Go though all attributes of the class
1100
for attrname, attribute in inspect.getmembers(cls):
1101
# Ignore non-D-Bus attributes, and D-Bus attributes
1102
# with the wrong interface name
1103
if (not hasattr(attribute, "_dbus_interface")
1104
or not attribute._dbus_interface.startswith(
1105
orig_interface_name)):
1107
# Create an alternate D-Bus interface name based on
1109
alt_interface = attribute._dbus_interface.replace(
1110
orig_interface_name, alt_interface_name)
1111
interface_names.add(alt_interface)
1112
# Is this a D-Bus signal?
1113
if getattr(attribute, "_dbus_is_signal", False):
1114
# Extract the original non-method undecorated
1115
# function by black magic
1116
nonmethod_func = (dict(
1117
zip(attribute.func_code.co_freevars,
1118
attribute.__closure__))
1119
["func"].cell_contents)
1120
# Create a new, but exactly alike, function
1121
# object, and decorate it to be a new D-Bus signal
1122
# with the alternate D-Bus interface name
1123
new_function = (dbus.service.signal(
1124
alt_interface, attribute._dbus_signature)
1125
(types.FunctionType(
1126
nonmethod_func.func_code,
1127
nonmethod_func.func_globals,
1128
nonmethod_func.func_name,
1129
nonmethod_func.func_defaults,
1130
nonmethod_func.func_closure)))
1131
# Copy annotations, if any
1133
new_function._dbus_annotations = dict(
1134
attribute._dbus_annotations)
1135
except AttributeError:
1137
# Define a creator of a function to call both the
1138
# original and alternate functions, so both the
1139
# original and alternate signals gets sent when
1140
# the function is called
1141
def fixscope(func1, func2):
1142
"""This function is a scope container to pass
1143
func1 and func2 to the "call_both" function
1144
outside of its arguments"""
1146
def call_both(*args, **kwargs):
1147
"""This function will emit two D-Bus
1148
signals by calling func1 and func2"""
1149
func1(*args, **kwargs)
1150
func2(*args, **kwargs)
1153
# Create the "call_both" function and add it to
1155
attr[attrname] = fixscope(attribute, new_function)
1156
# Is this a D-Bus method?
1157
elif getattr(attribute, "_dbus_is_method", False):
1158
# Create a new, but exactly alike, function
1159
# object. Decorate it to be a new D-Bus method
1160
# with the alternate D-Bus interface name. Add it
1163
dbus.service.method(
1165
attribute._dbus_in_signature,
1166
attribute._dbus_out_signature)
1167
(types.FunctionType(attribute.func_code,
1168
attribute.func_globals,
1169
attribute.func_name,
1170
attribute.func_defaults,
1171
attribute.func_closure)))
1172
# Copy annotations, if any
1174
attr[attrname]._dbus_annotations = dict(
1175
attribute._dbus_annotations)
1176
except AttributeError:
1178
# Is this a D-Bus property?
1179
elif getattr(attribute, "_dbus_is_property", False):
1180
# Create a new, but exactly alike, function
1181
# object, and decorate it to be a new D-Bus
1182
# property with the alternate D-Bus interface
1183
# name. Add it to the class.
1184
attr[attrname] = (dbus_service_property(
1185
alt_interface, attribute._dbus_signature,
1186
attribute._dbus_access,
1187
attribute._dbus_get_args_options
1189
(types.FunctionType(
1190
attribute.func_code,
1191
attribute.func_globals,
1192
attribute.func_name,
1193
attribute.func_defaults,
1194
attribute.func_closure)))
1195
# Copy annotations, if any
1197
attr[attrname]._dbus_annotations = dict(
1198
attribute._dbus_annotations)
1199
except AttributeError:
1201
# Is this a D-Bus interface?
1202
elif getattr(attribute, "_dbus_is_interface", False):
1203
# Create a new, but exactly alike, function
1204
# object. Decorate it to be a new D-Bus interface
1205
# with the alternate D-Bus interface name. Add it
1208
dbus_interface_annotations(alt_interface)
1209
(types.FunctionType(attribute.func_code,
1210
attribute.func_globals,
1211
attribute.func_name,
1212
attribute.func_defaults,
1213
attribute.func_closure)))
1215
# Deprecate all alternate interfaces
1216
iname="_AlternateDBusNames_interface_annotation{}"
1217
for interface_name in interface_names:
1219
@dbus_interface_annotations(interface_name)
1221
return { "org.freedesktop.DBus.Deprecated":
1223
# Find an unused name
1224
for aname in (iname.format(i)
1225
for i in itertools.count()):
1226
if aname not in attr:
1230
# Replace the class with a new subclass of it with
1231
# methods, signals, etc. as created above.
1232
cls = type(b"{}Alternate".format(cls.__name__),
1239
@alternate_dbus_interfaces({"se.recompile.Mandos":
1240
"se.bsnet.fukt.Mandos"})
1241
699
class ClientDBus(Client, DBusObjectWithProperties):
1242
700
"""A Client class using D-Bus
1245
703
dbus_object_path: dbus.ObjectPath
1246
704
bus: dbus.SystemBus()
1249
runtime_expansions = (Client.runtime_expansions
1250
+ ("dbus_object_path", ))
1252
_interface = "se.recompile.Mandos.Client"
1254
706
# dbus.service.Object doesn't use super(), so we can't either.
1256
708
def __init__(self, bus = None, *args, **kwargs):
709
self._approvals_pending = 0
1258
711
Client.__init__(self, *args, **kwargs)
1259
712
# Only now, when this client is initialized, can it show up on
1261
client_object_name = str(self.name).translate(
1262
{ord("."): ord("_"),
1263
ord("-"): ord("_")})
1264
self.dbus_object_path = dbus.ObjectPath(
1265
"/clients/" + client_object_name)
714
self.dbus_object_path = (dbus.ObjectPath
716
+ self.name.replace(u".", u"_")))
1266
717
DBusObjectWithProperties.__init__(self, self.bus,
1267
718
self.dbus_object_path)
1269
def notifychangeproperty(transform_func, dbus_name,
1270
type_func=lambda x: x,
1272
invalidate_only=False,
1273
_interface=_interface):
1274
""" Modify a variable so that it's a property which announces
1275
its changes to DBus.
1277
transform_fun: Function that takes a value and a variant_level
1278
and transforms it to a D-Bus type.
1279
dbus_name: D-Bus name of the variable
1280
type_func: Function that transform the value before sending it
1281
to the D-Bus. Default: no transform
1282
variant_level: D-Bus variant level. Default: 1
1284
attrname = "_{}".format(dbus_name)
1286
def setter(self, value):
1287
if hasattr(self, "dbus_object_path"):
1288
if (not hasattr(self, attrname) or
1289
type_func(getattr(self, attrname, None))
1290
!= type_func(value)):
1292
self.PropertiesChanged(
1293
_interface, dbus.Dictionary(),
1294
dbus.Array((dbus_name, )))
1296
dbus_value = transform_func(
1298
variant_level = variant_level)
1299
self.PropertyChanged(dbus.String(dbus_name),
1301
self.PropertiesChanged(
1303
dbus.Dictionary({ dbus.String(dbus_name):
1306
setattr(self, attrname, value)
1308
return property(lambda self: getattr(self, attrname), setter)
1310
expires = notifychangeproperty(datetime_to_dbus, "Expires")
1311
approvals_pending = notifychangeproperty(dbus.Boolean,
1314
enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1315
last_enabled = notifychangeproperty(datetime_to_dbus,
1317
checker = notifychangeproperty(
1318
dbus.Boolean, "CheckerRunning",
1319
type_func = lambda checker: checker is not None)
1320
last_checked_ok = notifychangeproperty(datetime_to_dbus,
1322
last_checker_status = notifychangeproperty(dbus.Int16,
1323
"LastCheckerStatus")
1324
last_approval_request = notifychangeproperty(
1325
datetime_to_dbus, "LastApprovalRequest")
1326
approved_by_default = notifychangeproperty(dbus.Boolean,
1327
"ApprovedByDefault")
1328
approval_delay = notifychangeproperty(
1329
dbus.UInt64, "ApprovalDelay",
1330
type_func = lambda td: td.total_seconds() * 1000)
1331
approval_duration = notifychangeproperty(
1332
dbus.UInt64, "ApprovalDuration",
1333
type_func = lambda td: td.total_seconds() * 1000)
1334
host = notifychangeproperty(dbus.String, "Host")
1335
timeout = notifychangeproperty(
1336
dbus.UInt64, "Timeout",
1337
type_func = lambda td: td.total_seconds() * 1000)
1338
extended_timeout = notifychangeproperty(
1339
dbus.UInt64, "ExtendedTimeout",
1340
type_func = lambda td: td.total_seconds() * 1000)
1341
interval = notifychangeproperty(
1342
dbus.UInt64, "Interval",
1343
type_func = lambda td: td.total_seconds() * 1000)
1344
checker_command = notifychangeproperty(dbus.String, "Checker")
1345
secret = notifychangeproperty(dbus.ByteArray, "Secret",
1346
invalidate_only=True)
1348
del notifychangeproperty
720
def _get_approvals_pending(self):
721
return self._approvals_pending
722
def _set_approvals_pending(self, value):
723
old_value = self._approvals_pending
724
self._approvals_pending = value
726
if (hasattr(self, "dbus_object_path")
727
and bval is not bool(old_value)):
728
dbus_bool = dbus.Boolean(bval, variant_level=1)
729
self.PropertyChanged(dbus.String(u"ApprovalPending"),
732
approvals_pending = property(_get_approvals_pending,
733
_set_approvals_pending)
734
del _get_approvals_pending, _set_approvals_pending
737
def _datetime_to_dbus(dt, variant_level=0):
738
"""Convert a UTC datetime.datetime() to a D-Bus type."""
739
return dbus.String(dt.isoformat(),
740
variant_level=variant_level)
743
oldstate = getattr(self, u"enabled", False)
744
r = Client.enable(self)
745
if oldstate != self.enabled:
747
self.PropertyChanged(dbus.String(u"Enabled"),
748
dbus.Boolean(True, variant_level=1))
749
self.PropertyChanged(
750
dbus.String(u"LastEnabled"),
751
self._datetime_to_dbus(self.last_enabled,
755
def disable(self, quiet = False):
756
oldstate = getattr(self, u"enabled", False)
757
r = Client.disable(self, quiet=quiet)
758
if not quiet and oldstate != self.enabled:
760
self.PropertyChanged(dbus.String(u"Enabled"),
761
dbus.Boolean(False, variant_level=1))
1350
764
def __del__(self, *args, **kwargs):
1352
766
self.remove_from_connection()
1353
767
except LookupError:
1355
if hasattr(DBusObjectWithProperties, "__del__"):
769
if hasattr(DBusObjectWithProperties, u"__del__"):
1356
770
DBusObjectWithProperties.__del__(self, *args, **kwargs)
1357
771
Client.__del__(self, *args, **kwargs)
1481
923
# ApprovalPending - property
1482
@dbus_service_property(_interface, signature="b", access="read")
924
@dbus_service_property(_interface, signature=u"b", access=u"read")
1483
925
def ApprovalPending_dbus_property(self):
1484
926
return dbus.Boolean(bool(self.approvals_pending))
1486
928
# ApprovedByDefault - property
1487
@dbus_service_property(_interface,
929
@dbus_service_property(_interface, signature=u"b",
1490
931
def ApprovedByDefault_dbus_property(self, value=None):
1491
932
if value is None: # get
1492
933
return dbus.Boolean(self.approved_by_default)
1493
934
self.approved_by_default = bool(value)
936
self.PropertyChanged(dbus.String(u"ApprovedByDefault"),
937
dbus.Boolean(value, variant_level=1))
1495
939
# ApprovalDelay - property
1496
@dbus_service_property(_interface,
940
@dbus_service_property(_interface, signature=u"t",
1499
942
def ApprovalDelay_dbus_property(self, value=None):
1500
943
if value is None: # get
1501
return dbus.UInt64(self.approval_delay.total_seconds()
944
return dbus.UInt64(self.approval_delay_milliseconds())
1503
945
self.approval_delay = datetime.timedelta(0, 0, 0, value)
947
self.PropertyChanged(dbus.String(u"ApprovalDelay"),
948
dbus.UInt64(value, variant_level=1))
1505
950
# ApprovalDuration - property
1506
@dbus_service_property(_interface,
951
@dbus_service_property(_interface, signature=u"t",
1509
953
def ApprovalDuration_dbus_property(self, value=None):
1510
954
if value is None: # get
1511
return dbus.UInt64(self.approval_duration.total_seconds()
955
return dbus.UInt64(self._timedelta_to_milliseconds(
956
self.approval_duration))
1513
957
self.approval_duration = datetime.timedelta(0, 0, 0, value)
959
self.PropertyChanged(dbus.String(u"ApprovalDuration"),
960
dbus.UInt64(value, variant_level=1))
1515
962
# Name - property
1516
@dbus_service_property(_interface, signature="s", access="read")
963
@dbus_service_property(_interface, signature=u"s", access=u"read")
1517
964
def Name_dbus_property(self):
1518
965
return dbus.String(self.name)
1520
967
# Fingerprint - property
1521
@dbus_service_property(_interface, signature="s", access="read")
968
@dbus_service_property(_interface, signature=u"s", access=u"read")
1522
969
def Fingerprint_dbus_property(self):
1523
970
return dbus.String(self.fingerprint)
1525
972
# Host - property
1526
@dbus_service_property(_interface,
973
@dbus_service_property(_interface, signature=u"s",
1529
975
def Host_dbus_property(self, value=None):
1530
976
if value is None: # get
1531
977
return dbus.String(self.host)
1532
self.host = str(value)
980
self.PropertyChanged(dbus.String(u"Host"),
981
dbus.String(value, variant_level=1))
1534
983
# Created - property
1535
@dbus_service_property(_interface, signature="s", access="read")
984
@dbus_service_property(_interface, signature=u"s", access=u"read")
1536
985
def Created_dbus_property(self):
1537
return datetime_to_dbus(self.created)
986
return dbus.String(self._datetime_to_dbus(self.created))
1539
988
# LastEnabled - property
1540
@dbus_service_property(_interface, signature="s", access="read")
989
@dbus_service_property(_interface, signature=u"s", access=u"read")
1541
990
def LastEnabled_dbus_property(self):
1542
return datetime_to_dbus(self.last_enabled)
991
if self.last_enabled is None:
992
return dbus.String(u"")
993
return dbus.String(self._datetime_to_dbus(self.last_enabled))
1544
995
# Enabled - property
1545
@dbus_service_property(_interface,
996
@dbus_service_property(_interface, signature=u"b",
1548
998
def Enabled_dbus_property(self, value=None):
1549
999
if value is None: # get
1550
1000
return dbus.Boolean(self.enabled)
1556
1006
# LastCheckedOK - property
1557
@dbus_service_property(_interface,
1007
@dbus_service_property(_interface, signature=u"s",
1008
access=u"readwrite")
1560
1009
def LastCheckedOK_dbus_property(self, value=None):
1561
1010
if value is not None:
1562
1011
self.checked_ok()
1564
return datetime_to_dbus(self.last_checked_ok)
1566
# LastCheckerStatus - property
1567
@dbus_service_property(_interface, signature="n", access="read")
1568
def LastCheckerStatus_dbus_property(self):
1569
return dbus.Int16(self.last_checker_status)
1571
# Expires - property
1572
@dbus_service_property(_interface, signature="s", access="read")
1573
def Expires_dbus_property(self):
1574
return datetime_to_dbus(self.expires)
1576
# LastApprovalRequest - property
1577
@dbus_service_property(_interface, signature="s", access="read")
1578
def LastApprovalRequest_dbus_property(self):
1579
return datetime_to_dbus(self.last_approval_request)
1013
if self.last_checked_ok is None:
1014
return dbus.String(u"")
1015
return dbus.String(self._datetime_to_dbus(self
1581
1018
# Timeout - property
1582
@dbus_service_property(_interface,
1019
@dbus_service_property(_interface, signature=u"t",
1020
access=u"readwrite")
1585
1021
def Timeout_dbus_property(self, value=None):
1586
1022
if value is None: # get
1587
return dbus.UInt64(self.timeout.total_seconds() * 1000)
1588
old_timeout = self.timeout
1023
return dbus.UInt64(self.timeout_milliseconds())
1589
1024
self.timeout = datetime.timedelta(0, 0, 0, value)
1590
# Reschedule disabling
1592
now = datetime.datetime.utcnow()
1593
self.expires += self.timeout - old_timeout
1594
if self.expires <= now:
1595
# The timeout has passed
1598
if (getattr(self, "disable_initiator_tag", None)
1601
gobject.source_remove(self.disable_initiator_tag)
1602
self.disable_initiator_tag = gobject.timeout_add(
1603
int((self.expires - now).total_seconds() * 1000),
1606
# ExtendedTimeout - property
1607
@dbus_service_property(_interface,
1610
def ExtendedTimeout_dbus_property(self, value=None):
1611
if value is None: # get
1612
return dbus.UInt64(self.extended_timeout.total_seconds()
1614
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1026
self.PropertyChanged(dbus.String(u"Timeout"),
1027
dbus.UInt64(value, variant_level=1))
1028
if getattr(self, u"disable_initiator_tag", None) is None:
1030
# Reschedule timeout
1031
gobject.source_remove(self.disable_initiator_tag)
1032
self.disable_initiator_tag = None
1033
time_to_die = (self.
1034
_timedelta_to_milliseconds((self
1039
if time_to_die <= 0:
1040
# The timeout has passed
1043
self.disable_initiator_tag = (gobject.timeout_add
1044
(time_to_die, self.disable))
1616
1046
# Interval - property
1617
@dbus_service_property(_interface,
1047
@dbus_service_property(_interface, signature=u"t",
1048
access=u"readwrite")
1620
1049
def Interval_dbus_property(self, value=None):
1621
1050
if value is None: # get
1622
return dbus.UInt64(self.interval.total_seconds() * 1000)
1051
return dbus.UInt64(self.interval_milliseconds())
1623
1052
self.interval = datetime.timedelta(0, 0, 0, value)
1624
if getattr(self, "checker_initiator_tag", None) is None:
1054
self.PropertyChanged(dbus.String(u"Interval"),
1055
dbus.UInt64(value, variant_level=1))
1056
if getattr(self, u"checker_initiator_tag", None) is None:
1627
# Reschedule checker run
1628
gobject.source_remove(self.checker_initiator_tag)
1629
self.checker_initiator_tag = gobject.timeout_add(
1630
value, self.start_checker)
1631
self.start_checker() # Start one now, too
1058
# Reschedule checker run
1059
gobject.source_remove(self.checker_initiator_tag)
1060
self.checker_initiator_tag = (gobject.timeout_add
1061
(value, self.start_checker))
1062
self.start_checker() # Start one now, too
1633
1064
# Checker - property
1634
@dbus_service_property(_interface,
1065
@dbus_service_property(_interface, signature=u"s",
1066
access=u"readwrite")
1637
1067
def Checker_dbus_property(self, value=None):
1638
1068
if value is None: # get
1639
1069
return dbus.String(self.checker_command)
1640
self.checker_command = str(value)
1070
self.checker_command = value
1072
self.PropertyChanged(dbus.String(u"Checker"),
1073
dbus.String(self.checker_command,
1642
1076
# CheckerRunning - property
1643
@dbus_service_property(_interface,
1077
@dbus_service_property(_interface, signature=u"b",
1078
access=u"readwrite")
1646
1079
def CheckerRunning_dbus_property(self, value=None):
1647
1080
if value is None: # get
1648
1081
return dbus.Boolean(self.checker is not None)
1704
1133
def handle(self):
1705
1134
with contextlib.closing(self.server.child_pipe) as child_pipe:
1706
logger.info("TCP connection from: %s",
1707
str(self.client_address))
1708
logger.debug("Pipe FD: %d",
1135
logger.info(u"TCP connection from: %s",
1136
unicode(self.client_address))
1137
logger.debug(u"Pipe FD: %d",
1709
1138
self.server.child_pipe.fileno())
1711
session = gnutls.connection.ClientSession(
1712
self.request, gnutls.connection .X509Credentials())
1140
session = (gnutls.connection
1141
.ClientSession(self.request,
1143
.X509Credentials()))
1714
1145
# Note: gnutls.connection.X509Credentials is really a
1715
1146
# generic GnuTLS certificate credentials object so long as
1716
1147
# no X.509 keys are added to it. Therefore, we can use it
1717
1148
# here despite using OpenPGP certificates.
1719
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1720
# "+AES-256-CBC", "+SHA1",
1721
# "+COMP-NULL", "+CTYPE-OPENPGP",
1150
#priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
1151
# u"+AES-256-CBC", u"+SHA1",
1152
# u"+COMP-NULL", u"+CTYPE-OPENPGP",
1723
1154
# Use a fallback default, since this MUST be set.
1724
1155
priority = self.server.gnutls_priority
1725
1156
if priority is None:
1727
gnutls.library.functions.gnutls_priority_set_direct(
1728
session._c_object, priority, None)
1157
priority = u"NORMAL"
1158
(gnutls.library.functions
1159
.gnutls_priority_set_direct(session._c_object,
1730
1162
# Start communication using the Mandos protocol
1731
1163
# Get protocol number
1732
1164
line = self.request.makefile().readline()
1733
logger.debug("Protocol version: %r", line)
1165
logger.debug(u"Protocol version: %r", line)
1735
1167
if int(line.strip().split()[0]) > 1:
1736
raise RuntimeError(line)
1737
except (ValueError, IndexError, RuntimeError) as error:
1738
logger.error("Unknown protocol version: %s", error)
1169
except (ValueError, IndexError, RuntimeError), error:
1170
logger.error(u"Unknown protocol version: %s", error)
1741
1173
# Start GnuTLS connection
1743
1175
session.handshake()
1744
except gnutls.errors.GNUTLSError as error:
1745
logger.warning("Handshake failed: %s", error)
1176
except gnutls.errors.GNUTLSError, error:
1177
logger.warning(u"Handshake failed: %s", error)
1746
1178
# Do not run session.bye() here: the session is not
1747
1179
# established. Just abandon the request.
1749
logger.debug("Handshake succeeded")
1181
logger.debug(u"Handshake succeeded")
1751
1183
approval_required = False
1754
fpr = self.fingerprint(
1755
self.peer_certificate(session))
1757
gnutls.errors.GNUTLSError) as error:
1758
logger.warning("Bad certificate: %s", error)
1186
fpr = self.fingerprint(self.peer_certificate
1188
except (TypeError, gnutls.errors.GNUTLSError), error:
1189
logger.warning(u"Bad certificate: %s", error)
1760
logger.debug("Fingerprint: %s", fpr)
1191
logger.debug(u"Fingerprint: %s", fpr)
1763
1194
client = ProxyClient(child_pipe, fpr,
1764
1195
self.client_address)
1872
1302
def fingerprint(openpgp):
1873
1303
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
1874
1304
# New GnuTLS "datum" with the OpenPGP public key
1875
datum = gnutls.library.types.gnutls_datum_t(
1876
ctypes.cast(ctypes.c_char_p(openpgp),
1877
ctypes.POINTER(ctypes.c_ubyte)),
1878
ctypes.c_uint(len(openpgp)))
1305
datum = (gnutls.library.types
1306
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1309
ctypes.c_uint(len(openpgp))))
1879
1310
# New empty GnuTLS certificate
1880
1311
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1881
gnutls.library.functions.gnutls_openpgp_crt_init(
1312
(gnutls.library.functions
1313
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
1883
1314
# Import the OpenPGP public key into the certificate
1884
gnutls.library.functions.gnutls_openpgp_crt_import(
1885
crt, ctypes.byref(datum),
1886
gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
1315
(gnutls.library.functions
1316
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1317
gnutls.library.constants
1318
.GNUTLS_OPENPGP_FMT_RAW))
1887
1319
# Verify the self signature in the key
1888
1320
crtverify = ctypes.c_uint()
1889
gnutls.library.functions.gnutls_openpgp_crt_verify_self(
1890
crt, 0, ctypes.byref(crtverify))
1321
(gnutls.library.functions
1322
.gnutls_openpgp_crt_verify_self(crt, 0,
1323
ctypes.byref(crtverify)))
1891
1324
if crtverify.value != 0:
1892
1325
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1893
raise gnutls.errors.CertificateSecurityError(
1326
raise (gnutls.errors.CertificateSecurityError
1895
1328
# New buffer for the fingerprint
1896
1329
buf = ctypes.create_string_buffer(20)
1897
1330
buf_len = ctypes.c_size_t()
1898
1331
# Get the fingerprint from the certificate into the buffer
1899
gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint(
1900
crt, ctypes.byref(buf), ctypes.byref(buf_len))
1332
(gnutls.library.functions
1333
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1334
ctypes.byref(buf_len)))
1901
1335
# Deinit the certificate
1902
1336
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1903
1337
# Convert the buffer to a Python bytestring
1904
1338
fpr = ctypes.string_at(buf, buf_len.value)
1905
1339
# Convert the bytestring to hexadecimal notation
1906
hex_fpr = binascii.hexlify(fpr).upper()
1340
hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
1910
1344
class MultiprocessingMixIn(object):
1911
1345
"""Like socketserver.ThreadingMixIn, but with multiprocessing"""
1913
1346
def sub_process_main(self, request, address):
1915
1348
self.finish_request(request, address)
1917
1350
self.handle_error(request, address)
1918
1351
self.close_request(request)
1920
1353
def process_request(self, request, address):
1921
1354
"""Start a new process to process the request."""
1922
proc = multiprocessing.Process(target = self.sub_process_main,
1923
args = (request, address))
1355
multiprocessing.Process(target = self.sub_process_main,
1356
args = (request, address)).start()
1928
1358
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1929
1359
""" adds a pipe to the MixIn """
1931
1360
def process_request(self, request, client_address):
1932
1361
"""Overrides and wraps the original process_request().
1934
1363
This function creates a new pipe in self.pipe
1936
1365
parent_pipe, self.child_pipe = multiprocessing.Pipe()
1938
proc = MultiprocessingMixIn.process_request(self, request,
1367
super(MultiprocessingMixInWithPipe,
1368
self).process_request(request, client_address)
1940
1369
self.child_pipe.close()
1941
self.add_pipe(parent_pipe, proc)
1943
def add_pipe(self, parent_pipe, proc):
1370
self.add_pipe(parent_pipe)
1372
def add_pipe(self, parent_pipe):
1944
1373
"""Dummy function; override as necessary"""
1945
raise NotImplementedError()
1948
1376
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1949
1377
socketserver.TCPServer, object):
1954
1382
interface: None or a network interface name (string)
1955
1383
use_ipv6: Boolean; to use IPv6 or not
1958
1385
def __init__(self, server_address, RequestHandlerClass,
1962
"""If socketfd is set, use that file descriptor instead of
1963
creating a new one with socket.socket().
1386
interface=None, use_ipv6=True):
1965
1387
self.interface = interface
1967
1389
self.address_family = socket.AF_INET6
1968
if socketfd is not None:
1969
# Save the file descriptor
1970
self.socketfd = socketfd
1971
# Save the original socket.socket() function
1972
self.socket_socket = socket.socket
1973
# To implement --socket, we monkey patch socket.socket.
1975
# (When socketserver.TCPServer is a new-style class, we
1976
# could make self.socket into a property instead of monkey
1977
# patching socket.socket.)
1979
# Create a one-time-only replacement for socket.socket()
1980
@functools.wraps(socket.socket)
1981
def socket_wrapper(*args, **kwargs):
1982
# Restore original function so subsequent calls are
1984
socket.socket = self.socket_socket
1985
del self.socket_socket
1986
# This time only, return a new socket object from the
1987
# saved file descriptor.
1988
return socket.fromfd(self.socketfd, *args, **kwargs)
1989
# Replace socket.socket() function with wrapper
1990
socket.socket = socket_wrapper
1991
# The socketserver.TCPServer.__init__ will call
1992
# socket.socket(), which might be our replacement,
1993
# socket_wrapper(), if socketfd was set.
1994
1390
socketserver.TCPServer.__init__(self, server_address,
1995
1391
RequestHandlerClass)
1997
1392
def server_bind(self):
1998
1393
"""This overrides the normal server_bind() function
1999
1394
to bind to an interface if one was specified, and also NOT to
2000
1395
bind to an address or port if they were not specified."""
2001
1396
if self.interface is not None:
2002
1397
if SO_BINDTODEVICE is None:
2003
logger.error("SO_BINDTODEVICE does not exist;"
2004
" cannot bind to interface %s",
1398
logger.error(u"SO_BINDTODEVICE does not exist;"
1399
u" cannot bind to interface %s",
2005
1400
self.interface)
2008
self.socket.setsockopt(
2009
socket.SOL_SOCKET, SO_BINDTODEVICE,
2010
(self.interface + "\0").encode("utf-8"))
2011
except socket.error as error:
2012
if error.errno == errno.EPERM:
2013
logger.error("No permission to bind to"
2014
" interface %s", self.interface)
2015
elif error.errno == errno.ENOPROTOOPT:
2016
logger.error("SO_BINDTODEVICE not available;"
2017
" cannot bind to interface %s",
2019
elif error.errno == errno.ENODEV:
2020
logger.error("Interface %s does not exist,"
2021
" cannot bind", self.interface)
1403
self.socket.setsockopt(socket.SOL_SOCKET,
1407
except socket.error, error:
1408
if error[0] == errno.EPERM:
1409
logger.error(u"No permission to"
1410
u" bind to interface %s",
1412
elif error[0] == errno.ENOPROTOOPT:
1413
logger.error(u"SO_BINDTODEVICE not available;"
1414
u" cannot bind to interface %s",
2024
1418
# Only bind(2) the socket if we really need to.
2025
1419
if self.server_address[0] or self.server_address[1]:
2026
1420
if not self.server_address[0]:
2027
1421
if self.address_family == socket.AF_INET6:
2028
any_address = "::" # in6addr_any
1422
any_address = u"::" # in6addr_any
2030
any_address = "0.0.0.0" # INADDR_ANY
1424
any_address = socket.INADDR_ANY
2031
1425
self.server_address = (any_address,
2032
1426
self.server_address[1])
2033
1427
elif not self.server_address[1]:
2034
self.server_address = (self.server_address[0], 0)
1428
self.server_address = (self.server_address[0],
2035
1430
# if self.interface:
2036
1431
# self.server_address = (self.server_address[0],
2105
1499
fpr = request[1]
2106
1500
address = request[2]
2108
for c in self.clients.itervalues():
1502
for c in self.clients:
2109
1503
if c.fingerprint == fpr:
2113
logger.info("Client not found for fingerprint: %s, ad"
2114
"dress: %s", fpr, address)
1507
logger.warning(u"Client not found for fingerprint: %s, ad"
1508
u"dress: %s", fpr, address)
2115
1509
if self.use_dbus:
2116
1510
# Emit D-Bus signal
2117
mandos_dbus_service.ClientNotFound(fpr,
1511
mandos_dbus_service.ClientNotFound(fpr, address)
2119
1512
parent_pipe.send(False)
2122
gobject.io_add_watch(
2123
parent_pipe.fileno(),
2124
gobject.IO_IN | gobject.IO_HUP,
2125
functools.partial(self.handle_ipc,
2126
parent_pipe = parent_pipe,
2128
client_object = client))
1515
gobject.io_add_watch(parent_pipe.fileno(),
1516
gobject.IO_IN | gobject.IO_HUP,
1517
functools.partial(self.handle_ipc,
1518
parent_pipe = parent_pipe,
1519
client_object = client))
2129
1520
parent_pipe.send(True)
2130
# remove the old hook in favor of the new above hook on
1521
# remove the old hook in favor of the new above hook on same fileno
2133
1523
if command == 'funcall':
2134
1524
funcname = request[1]
2135
1525
args = request[2]
2136
1526
kwargs = request[3]
2138
parent_pipe.send(('data', getattr(client_object,
1528
parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
2142
1530
if command == 'getattr':
2143
1531
attrname = request[1]
2144
1532
if callable(client_object.__getattribute__(attrname)):
2145
parent_pipe.send(('function', ))
1533
parent_pipe.send(('function',))
2148
'data', client_object.__getattribute__(attrname)))
1535
parent_pipe.send(('data', client_object.__getattribute__(attrname)))
2150
1537
if command == 'setattr':
2151
1538
attrname = request[1]
2152
1539
value = request[2]
2153
1540
setattr(client_object, attrname, value)
2158
def rfc3339_duration_to_delta(duration):
2159
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
2161
>>> rfc3339_duration_to_delta("P7D")
2162
datetime.timedelta(7)
2163
>>> rfc3339_duration_to_delta("PT60S")
2164
datetime.timedelta(0, 60)
2165
>>> rfc3339_duration_to_delta("PT60M")
2166
datetime.timedelta(0, 3600)
2167
>>> rfc3339_duration_to_delta("PT24H")
2168
datetime.timedelta(1)
2169
>>> rfc3339_duration_to_delta("P1W")
2170
datetime.timedelta(7)
2171
>>> rfc3339_duration_to_delta("PT5M30S")
2172
datetime.timedelta(0, 330)
2173
>>> rfc3339_duration_to_delta("P1DT3M20S")
2174
datetime.timedelta(1, 200)
2177
# Parsing an RFC 3339 duration with regular expressions is not
2178
# possible - there would have to be multiple places for the same
2179
# values, like seconds. The current code, while more esoteric, is
2180
# cleaner without depending on a parsing library. If Python had a
2181
# built-in library for parsing we would use it, but we'd like to
2182
# avoid excessive use of external libraries.
2184
# New type for defining tokens, syntax, and semantics all-in-one
2185
Token = collections.namedtuple("Token",
2186
("regexp", # To match token; if
2187
# "value" is not None,
2188
# must have a "group"
2190
"value", # datetime.timedelta or
2192
"followers")) # Tokens valid after
2194
Token = collections.namedtuple("Token", (
2195
"regexp", # To match token; if "value" is not None, must have
2196
# a "group" containing digits
2197
"value", # datetime.timedelta or None
2198
"followers")) # Tokens valid after this token
2199
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2200
# the "duration" ABNF definition in RFC 3339, Appendix A.
2201
token_end = Token(re.compile(r"$"), None, frozenset())
2202
token_second = Token(re.compile(r"(\d+)S"),
2203
datetime.timedelta(seconds=1),
2204
frozenset((token_end, )))
2205
token_minute = Token(re.compile(r"(\d+)M"),
2206
datetime.timedelta(minutes=1),
2207
frozenset((token_second, token_end)))
2208
token_hour = Token(re.compile(r"(\d+)H"),
2209
datetime.timedelta(hours=1),
2210
frozenset((token_minute, token_end)))
2211
token_time = Token(re.compile(r"T"),
2213
frozenset((token_hour, token_minute,
2215
token_day = Token(re.compile(r"(\d+)D"),
2216
datetime.timedelta(days=1),
2217
frozenset((token_time, token_end)))
2218
token_month = Token(re.compile(r"(\d+)M"),
2219
datetime.timedelta(weeks=4),
2220
frozenset((token_day, token_end)))
2221
token_year = Token(re.compile(r"(\d+)Y"),
2222
datetime.timedelta(weeks=52),
2223
frozenset((token_month, token_end)))
2224
token_week = Token(re.compile(r"(\d+)W"),
2225
datetime.timedelta(weeks=1),
2226
frozenset((token_end, )))
2227
token_duration = Token(re.compile(r"P"), None,
2228
frozenset((token_year, token_month,
2229
token_day, token_time,
2231
# Define starting values
2232
value = datetime.timedelta() # Value so far
2234
followers = frozenset((token_duration,)) # Following valid tokens
2235
s = duration # String left to parse
2236
# Loop until end token is found
2237
while found_token is not token_end:
2238
# Search for any currently valid tokens
2239
for token in followers:
2240
match = token.regexp.match(s)
2241
if match is not None:
2243
if token.value is not None:
2244
# Value found, parse digits
2245
factor = int(match.group(1), 10)
2246
# Add to value so far
2247
value += factor * token.value
2248
# Strip token from string
2249
s = token.regexp.sub("", s, 1)
2252
# Set valid next tokens
2253
followers = found_token.followers
2256
# No currently valid tokens were found
2257
raise ValueError("Invalid RFC 3339 duration")
2262
1545
def string_to_delta(interval):
2263
1546
"""Parse a string and return a datetime.timedelta
2265
>>> string_to_delta('7d')
1548
>>> string_to_delta(u'7d')
2266
1549
datetime.timedelta(7)
2267
>>> string_to_delta('60s')
1550
>>> string_to_delta(u'60s')
2268
1551
datetime.timedelta(0, 60)
2269
>>> string_to_delta('60m')
1552
>>> string_to_delta(u'60m')
2270
1553
datetime.timedelta(0, 3600)
2271
>>> string_to_delta('24h')
1554
>>> string_to_delta(u'24h')
2272
1555
datetime.timedelta(1)
2273
>>> string_to_delta('1w')
1556
>>> string_to_delta(u'1w')
2274
1557
datetime.timedelta(7)
2275
>>> string_to_delta('5m 30s')
1558
>>> string_to_delta(u'5m 30s')
2276
1559
datetime.timedelta(0, 330)
2280
return rfc3339_duration_to_delta(interval)
2284
1561
timevalue = datetime.timedelta(0)
2285
1562
for s in interval.split():
1564
suffix = unicode(s[-1])
2288
1565
value = int(s[:-1])
2290
1567
delta = datetime.timedelta(value)
1568
elif suffix == u"s":
2292
1569
delta = datetime.timedelta(0, value)
1570
elif suffix == u"m":
2294
1571
delta = datetime.timedelta(0, 0, 0, 0, value)
1572
elif suffix == u"h":
2296
1573
delta = datetime.timedelta(0, 0, 0, 0, 0, value)
1574
elif suffix == u"w":
2298
1575
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2300
raise ValueError("Unknown suffix {!r}".format(suffix))
2301
except IndexError as e:
2302
raise ValueError(*(e.args))
1577
raise ValueError(u"Unknown suffix %r" % suffix)
1578
except (ValueError, IndexError), e:
1579
raise ValueError(e.message)
2303
1580
timevalue += delta
2304
1581
return timevalue
1584
def if_nametoindex(interface):
1585
"""Call the C function if_nametoindex(), or equivalent
1587
Note: This function cannot accept a unicode string."""
1588
global if_nametoindex
1590
if_nametoindex = (ctypes.cdll.LoadLibrary
1591
(ctypes.util.find_library(u"c"))
1593
except (OSError, AttributeError):
1594
logger.warning(u"Doing if_nametoindex the hard way")
1595
def if_nametoindex(interface):
1596
"Get an interface index the hard way, i.e. using fcntl()"
1597
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
1598
with contextlib.closing(socket.socket()) as s:
1599
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1600
struct.pack(str(u"16s16x"),
1602
interface_index = struct.unpack(str(u"I"),
1604
return interface_index
1605
return if_nametoindex(interface)
2307
1608
def daemon(nochdir = False, noclose = False):
2308
1609
"""See daemon(3). Standard BSD Unix function.
2334
1635
##################################################################
2335
1636
# Parsing of options, both command line and config file
2337
parser = argparse.ArgumentParser()
2338
parser.add_argument("-v", "--version", action="version",
2339
version = "%(prog)s {}".format(version),
2340
help="show version number and exit")
2341
parser.add_argument("-i", "--interface", metavar="IF",
2342
help="Bind to interface IF")
2343
parser.add_argument("-a", "--address",
2344
help="Address to listen for requests on")
2345
parser.add_argument("-p", "--port", type=int,
2346
help="Port number to receive requests on")
2347
parser.add_argument("--check", action="store_true",
2348
help="Run self-test")
2349
parser.add_argument("--debug", action="store_true",
2350
help="Debug mode; run in foreground and log"
2351
" to terminal", default=None)
2352
parser.add_argument("--debuglevel", metavar="LEVEL",
2353
help="Debug level for stdout output")
2354
parser.add_argument("--priority", help="GnuTLS"
2355
" priority string (see GnuTLS documentation)")
2356
parser.add_argument("--servicename",
2357
metavar="NAME", help="Zeroconf service name")
2358
parser.add_argument("--configdir",
2359
default="/etc/mandos", metavar="DIR",
2360
help="Directory to search for configuration"
2362
parser.add_argument("--no-dbus", action="store_false",
2363
dest="use_dbus", help="Do not provide D-Bus"
2364
" system bus interface", default=None)
2365
parser.add_argument("--no-ipv6", action="store_false",
2366
dest="use_ipv6", help="Do not use IPv6",
2368
parser.add_argument("--no-restore", action="store_false",
2369
dest="restore", help="Do not restore stored"
2370
" state", default=None)
2371
parser.add_argument("--socket", type=int,
2372
help="Specify a file descriptor to a network"
2373
" socket to use instead of creating one")
2374
parser.add_argument("--statedir", metavar="DIR",
2375
help="Directory to save/restore state in")
2376
parser.add_argument("--foreground", action="store_true",
2377
help="Run in foreground", default=None)
2378
parser.add_argument("--no-zeroconf", action="store_false",
2379
dest="zeroconf", help="Do not use Zeroconf",
2382
options = parser.parse_args()
1638
parser = optparse.OptionParser(version = "%%prog %s" % version)
1639
parser.add_option("-i", u"--interface", type=u"string",
1640
metavar="IF", help=u"Bind to interface IF")
1641
parser.add_option("-a", u"--address", type=u"string",
1642
help=u"Address to listen for requests on")
1643
parser.add_option("-p", u"--port", type=u"int",
1644
help=u"Port number to receive requests on")
1645
parser.add_option("--check", action=u"store_true",
1646
help=u"Run self-test")
1647
parser.add_option("--debug", action=u"store_true",
1648
help=u"Debug mode; run in foreground and log to"
1650
parser.add_option("--debuglevel", type=u"string", metavar="Level",
1651
help=u"Debug level for stdout output")
1652
parser.add_option("--priority", type=u"string", help=u"GnuTLS"
1653
u" priority string (see GnuTLS documentation)")
1654
parser.add_option("--servicename", type=u"string",
1655
metavar=u"NAME", help=u"Zeroconf service name")
1656
parser.add_option("--configdir", type=u"string",
1657
default=u"/etc/mandos", metavar=u"DIR",
1658
help=u"Directory to search for configuration"
1660
parser.add_option("--no-dbus", action=u"store_false",
1661
dest=u"use_dbus", help=u"Do not provide D-Bus"
1662
u" system bus interface")
1663
parser.add_option("--no-ipv6", action=u"store_false",
1664
dest=u"use_ipv6", help=u"Do not use IPv6")
1665
options = parser.parse_args()[0]
2384
1667
if options.check:
2386
fail_count, test_count = doctest.testmod()
2387
sys.exit(os.EX_OK if fail_count == 0 else 1)
2389
1672
# Default values for config file for server-global settings
2390
server_defaults = { "interface": "",
2395
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
2396
":+SIGN-RSA-SHA224:+SIGN-RSA-RMD160",
2397
"servicename": "Mandos",
2403
"statedir": "/var/lib/mandos",
2404
"foreground": "False",
1673
server_defaults = { u"interface": u"",
1678
u"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1679
u"servicename": u"Mandos",
1680
u"use_dbus": u"True",
1681
u"use_ipv6": u"True",
2408
1685
# Parse config file for server-global settings
2409
1686
server_config = configparser.SafeConfigParser(server_defaults)
2410
1687
del server_defaults
2411
server_config.read(os.path.join(options.configdir, "mandos.conf"))
1688
server_config.read(os.path.join(options.configdir,
2412
1690
# Convert the SafeConfigParser object to a dict
2413
1691
server_settings = server_config.defaults()
2414
1692
# Use the appropriate methods on the non-string config options
2415
for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
2416
server_settings[option] = server_config.getboolean("DEFAULT",
1693
for option in (u"debug", u"use_dbus", u"use_ipv6"):
1694
server_settings[option] = server_config.getboolean(u"DEFAULT",
2418
1696
if server_settings["port"]:
2419
server_settings["port"] = server_config.getint("DEFAULT",
2421
if server_settings["socket"]:
2422
server_settings["socket"] = server_config.getint("DEFAULT",
2424
# Later, stdin will, and stdout and stderr might, be dup'ed
2425
# over with an opened os.devnull. But we don't want this to
2426
# happen with a supplied network socket.
2427
if 0 <= server_settings["socket"] <= 2:
2428
server_settings["socket"] = os.dup(server_settings
1697
server_settings["port"] = server_config.getint(u"DEFAULT",
2430
1699
del server_config
2432
1701
# Override the settings from the config file with command line
2433
1702
# options, if set.
2434
for option in ("interface", "address", "port", "debug",
2435
"priority", "servicename", "configdir", "use_dbus",
2436
"use_ipv6", "debuglevel", "restore", "statedir",
2437
"socket", "foreground", "zeroconf"):
1703
for option in (u"interface", u"address", u"port", u"debug",
1704
u"priority", u"servicename", u"configdir",
1705
u"use_dbus", u"use_ipv6", u"debuglevel"):
2438
1706
value = getattr(options, option)
2439
1707
if value is not None:
2440
1708
server_settings[option] = value
2442
1710
# Force all strings to be unicode
2443
1711
for option in server_settings.keys():
2444
if isinstance(server_settings[option], bytes):
2445
server_settings[option] = (server_settings[option]
2447
# Force all boolean options to be boolean
2448
for option in ("debug", "use_dbus", "use_ipv6", "restore",
2449
"foreground", "zeroconf"):
2450
server_settings[option] = bool(server_settings[option])
2451
# Debug implies foreground
2452
if server_settings["debug"]:
2453
server_settings["foreground"] = True
1712
if type(server_settings[option]) is str:
1713
server_settings[option] = unicode(server_settings[option])
2454
1714
# Now we have our good server settings in "server_settings"
2456
1716
##################################################################
2458
if (not server_settings["zeroconf"]
2459
and not (server_settings["port"]
2460
or server_settings["socket"] != "")):
2461
parser.error("Needs port or socket to work without Zeroconf")
2463
1718
# For convenience
2464
debug = server_settings["debug"]
2465
debuglevel = server_settings["debuglevel"]
2466
use_dbus = server_settings["use_dbus"]
2467
use_ipv6 = server_settings["use_ipv6"]
2468
stored_state_path = os.path.join(server_settings["statedir"],
2470
foreground = server_settings["foreground"]
2471
zeroconf = server_settings["zeroconf"]
2474
initlogger(debug, logging.DEBUG)
2479
level = getattr(logging, debuglevel.upper())
2480
initlogger(debug, level)
2482
if server_settings["servicename"] != "Mandos":
2483
syslogger.setFormatter(
2484
logging.Formatter('Mandos ({}) [%(process)d]:'
2485
' %(levelname)s: %(message)s'.format(
2486
server_settings["servicename"])))
1719
debug = server_settings[u"debug"]
1720
debuglevel = server_settings[u"debuglevel"]
1721
use_dbus = server_settings[u"use_dbus"]
1722
use_ipv6 = server_settings[u"use_ipv6"]
1724
if server_settings[u"servicename"] != u"Mandos":
1725
syslogger.setFormatter(logging.Formatter
1726
(u'Mandos (%s) [%%(process)d]:'
1727
u' %%(levelname)s: %%(message)s'
1728
% server_settings[u"servicename"]))
2488
1730
# Parse config file with clients
2489
client_config = configparser.SafeConfigParser(Client
2491
client_config.read(os.path.join(server_settings["configdir"],
1731
client_defaults = { u"timeout": u"1h",
1733
u"checker": u"fping -q -- %%(host)s",
1735
u"approval_delay": u"0s",
1736
u"approval_duration": u"1s",
1738
client_config = configparser.SafeConfigParser(client_defaults)
1739
client_config.read(os.path.join(server_settings[u"configdir"],
2494
1742
global mandos_dbus_service
2495
1743
mandos_dbus_service = None
2498
if server_settings["socket"] != "":
2499
socketfd = server_settings["socket"]
2500
tcp_server = MandosServer(
2501
(server_settings["address"], server_settings["port"]),
2503
interface=(server_settings["interface"] or None),
2505
gnutls_priority=server_settings["priority"],
2509
pidfilename = "/run/mandos.pid"
2510
if not os.path.isdir("/run/."):
2511
pidfilename = "/var/run/mandos.pid"
2514
pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
2515
except IOError as e:
2516
logger.error("Could not open file %r", pidfilename,
1745
tcp_server = MandosServer((server_settings[u"address"],
1746
server_settings[u"port"]),
1748
interface=(server_settings[u"interface"]
1752
server_settings[u"priority"],
1754
pidfilename = u"/var/run/mandos.pid"
1756
pidfile = open(pidfilename, u"w")
1758
logger.error(u"Could not open file %r", pidfilename)
2519
for name in ("_mandos", "mandos", "nobody"):
1761
uid = pwd.getpwnam(u"_mandos").pw_uid
1762
gid = pwd.getpwnam(u"_mandos").pw_gid
2521
uid = pwd.getpwnam(name).pw_uid
2522
gid = pwd.getpwnam(name).pw_gid
1765
uid = pwd.getpwnam(u"mandos").pw_uid
1766
gid = pwd.getpwnam(u"mandos").pw_gid
2524
1767
except KeyError:
1769
uid = pwd.getpwnam(u"nobody").pw_uid
1770
gid = pwd.getpwnam(u"nobody").pw_gid
2532
except OSError as error:
2533
if error.errno != errno.EPERM:
1777
except OSError, error:
1778
if error[0] != errno.EPERM:
1781
if not debug and not debuglevel:
1782
syslogger.setLevel(logging.WARNING)
1783
console.setLevel(logging.WARNING)
1785
level = getattr(logging, debuglevel.upper())
1786
syslogger.setLevel(level)
1787
console.setLevel(level)
2537
1790
# Enable all possible GnuTLS debugging
2543
1796
@gnutls.library.types.gnutls_log_func
2544
1797
def debug_gnutls(level, string):
2545
logger.debug("GnuTLS: %s", string[:-1])
1798
logger.debug(u"GnuTLS: %s", string[:-1])
2547
gnutls.library.functions.gnutls_global_set_log_function(
1800
(gnutls.library.functions
1801
.gnutls_global_set_log_function(debug_gnutls))
2550
1803
# Redirect stdin so all checkers get /dev/null
2551
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
1804
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2552
1805
os.dup2(null, sys.stdin.fileno())
2556
# Need to fork before connecting to D-Bus
2558
# Close all input and output, do double fork, etc.
2561
# multiprocessing will use threads, so before we use gobject we
2562
# need to inform gobject that threads will be used.
2563
gobject.threads_init()
1809
# No console logging
1810
logger.removeHandler(console)
2565
1813
global main_loop
2566
1814
# From the Avahi example code
2567
DBusGMainLoop(set_as_default=True)
1815
DBusGMainLoop(set_as_default=True )
2568
1816
main_loop = gobject.MainLoop()
2569
1817
bus = dbus.SystemBus()
2570
1818
# End of Avahi example code
2573
bus_name = dbus.service.BusName("se.recompile.Mandos",
2576
old_bus_name = dbus.service.BusName(
2577
"se.bsnet.fukt.Mandos", bus,
2579
except dbus.exceptions.DBusException as e:
2580
logger.error("Disabling D-Bus:", exc_info=e)
1821
bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos",
1822
bus, do_not_queue=True)
1823
except dbus.exceptions.NameExistsException, e:
1824
logger.error(unicode(e) + u", disabling D-Bus")
2581
1825
use_dbus = False
2582
server_settings["use_dbus"] = False
1826
server_settings[u"use_dbus"] = False
2583
1827
tcp_server.use_dbus = False
2585
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2586
service = AvahiServiceToSyslog(
2587
name = server_settings["servicename"],
2588
servicetype = "_mandos._tcp",
2589
protocol = protocol,
2591
if server_settings["interface"]:
2592
service.interface = if_nametoindex(
2593
server_settings["interface"].encode("utf-8"))
1828
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1829
service = AvahiService(name = server_settings[u"servicename"],
1830
servicetype = u"_mandos._tcp",
1831
protocol = protocol, bus = bus)
1832
if server_settings["interface"]:
1833
service.interface = (if_nametoindex
1834
(str(server_settings[u"interface"])))
1837
# Close all input and output, do double fork, etc.
2595
1840
global multiprocessing_manager
2596
1841
multiprocessing_manager = multiprocessing.Manager()
2598
1843
client_class = Client
2600
1845
client_class = functools.partial(ClientDBus, bus = bus)
2602
client_settings = Client.config_parser(client_config)
2603
old_client_settings = {}
2606
# This is used to redirect stdout and stderr for checker processes
2608
wnull = open(os.devnull, "w") # A writable /dev/null
2609
# Only used if server is running in foreground but not in debug
2611
if debug or not foreground:
2614
# Get client data and settings from last running state.
2615
if server_settings["restore"]:
2617
with open(stored_state_path, "rb") as stored_state:
2618
clients_data, old_client_settings = pickle.load(
2620
os.remove(stored_state_path)
2621
except IOError as e:
2622
if e.errno == errno.ENOENT:
2623
logger.warning("Could not load persistent state:"
2624
" {}".format(os.strerror(e.errno)))
2626
logger.critical("Could not load persistent state:",
2629
except EOFError as e:
2630
logger.warning("Could not load persistent state: "
2634
with PGPEngine() as pgp:
2635
for client_name, client in clients_data.items():
2636
# Skip removed clients
2637
if client_name not in client_settings:
2640
# Decide which value to use after restoring saved state.
2641
# We have three different values: Old config file,
2642
# new config file, and saved state.
2643
# New config value takes precedence if it differs from old
2644
# config value, otherwise use saved state.
2645
for name, value in client_settings[client_name].items():
2647
# For each value in new config, check if it
2648
# differs from the old config value (Except for
2649
# the "secret" attribute)
2650
if (name != "secret"
2652
old_client_settings[client_name][name])):
2653
client[name] = value
2657
# Clients who has passed its expire date can still be
2658
# enabled if its last checker was successful. Clients
2659
# whose checker succeeded before we stored its state is
2660
# assumed to have successfully run all checkers during
2662
if client["enabled"]:
2663
if datetime.datetime.utcnow() >= client["expires"]:
2664
if not client["last_checked_ok"]:
2666
"disabling client {} - Client never "
2667
"performed a successful checker".format(
2669
client["enabled"] = False
2670
elif client["last_checker_status"] != 0:
2672
"disabling client {} - Client last"
2673
" checker failed with error code"
2676
client["last_checker_status"]))
2677
client["enabled"] = False
2679
client["expires"] = (
2680
datetime.datetime.utcnow()
2681
+ client["timeout"])
2682
logger.debug("Last checker succeeded,"
2683
" keeping {} enabled".format(
1846
def client_config_items(config, section):
1847
special_settings = {
1848
"approved_by_default":
1849
lambda: config.getboolean(section,
1850
"approved_by_default"),
1852
for name, value in config.items(section):
2686
client["secret"] = pgp.decrypt(
2687
client["encrypted_secret"],
2688
client_settings[client_name]["secret"])
2690
# If decryption fails, we use secret from new settings
2691
logger.debug("Failed to decrypt {} old secret".format(
2693
client["secret"] = (client_settings[client_name]
2696
# Add/remove clients based on new changes made to config
2697
for client_name in (set(old_client_settings)
2698
- set(client_settings)):
2699
del clients_data[client_name]
2700
for client_name in (set(client_settings)
2701
- set(old_client_settings)):
2702
clients_data[client_name] = client_settings[client_name]
2704
# Create all client objects
2705
for client_name, client in clients_data.items():
2706
tcp_server.clients[client_name] = client_class(
2709
server_settings = server_settings)
1854
yield (name, special_settings[name]())
1858
tcp_server.clients.update(set(
1859
client_class(name = section,
1860
config= dict(client_config_items(
1861
client_config, section)))
1862
for section in client_config.sections()))
2711
1863
if not tcp_server.clients:
2712
logger.warning("No clients defined")
2715
if pidfile is not None:
1864
logger.warning(u"No clients defined")
2716
1868
pid = os.getpid()
2719
print(pid, file=pidfile)
2721
logger.error("Could not write to file %r with PID %d",
1869
pidfile.write(str(pid) + "\n")
1872
logger.error(u"Could not write to file %r with PID %d",
1875
# "pidfile" was never created
1880
signal.signal(signal.SIGINT, signal.SIG_IGN)
2726
1881
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2727
1882
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2731
@alternate_dbus_interfaces(
2732
{ "se.recompile.Mandos": "se.bsnet.fukt.Mandos" })
2733
class MandosDBusService(DBusObjectWithProperties):
1885
class MandosDBusService(dbus.service.Object):
2734
1886
"""A D-Bus proxy object"""
2736
1887
def __init__(self):
2737
dbus.service.Object.__init__(self, bus, "/")
2739
_interface = "se.recompile.Mandos"
2741
@dbus_interface_annotations(_interface)
2744
"org.freedesktop.DBus.Property.EmitsChangedSignal":
2747
@dbus.service.signal(_interface, signature="o")
1888
dbus.service.Object.__init__(self, bus, u"/")
1889
_interface = u"se.bsnet.fukt.Mandos"
1891
@dbus.service.signal(_interface, signature=u"o")
2748
1892
def ClientAdded(self, objpath):
2752
@dbus.service.signal(_interface, signature="ss")
1896
@dbus.service.signal(_interface, signature=u"ss")
2753
1897
def ClientNotFound(self, fingerprint, address):
2757
@dbus.service.signal(_interface, signature="os")
1901
@dbus.service.signal(_interface, signature=u"os")
2758
1902
def ClientRemoved(self, objpath, name):
2762
@dbus.service.method(_interface, out_signature="ao")
1906
@dbus.service.method(_interface, out_signature=u"ao")
2763
1907
def GetAllClients(self):
2765
return dbus.Array(c.dbus_object_path for c in
2766
tcp_server.clients.itervalues())
1909
return dbus.Array(c.dbus_object_path
1910
for c in tcp_server.clients)
2768
1912
@dbus.service.method(_interface,
2769
out_signature="a{oa{sv}}")
1913
out_signature=u"a{oa{sv}}")
2770
1914
def GetAllClientsWithProperties(self):
2772
1916
return dbus.Dictionary(
2773
{ c.dbus_object_path: c.GetAll("")
2774
for c in tcp_server.clients.itervalues() },
1917
((c.dbus_object_path, c.GetAll(u""))
1918
for c in tcp_server.clients),
1919
signature=u"oa{sv}")
2777
@dbus.service.method(_interface, in_signature="o")
1921
@dbus.service.method(_interface, in_signature=u"o")
2778
1922
def RemoveClient(self, object_path):
2780
for c in tcp_server.clients.itervalues():
1924
for c in tcp_server.clients:
2781
1925
if c.dbus_object_path == object_path:
2782
del tcp_server.clients[c.name]
1926
tcp_server.clients.remove(c)
2783
1927
c.remove_from_connection()
2784
1928
# Don't signal anything except ClientRemoved
2785
1929
c.disable(quiet=True)
2796
1940
"Cleanup function; run on exit"
2800
multiprocessing.active_children()
2802
if not (tcp_server.clients or client_settings):
2805
# Store client before exiting. Secrets are encrypted with key
2806
# based on what config file has. If config file is
2807
# removed/edited, old secret will thus be unrecovable.
2809
with PGPEngine() as pgp:
2810
for client in tcp_server.clients.itervalues():
2811
key = client_settings[client.name]["secret"]
2812
client.encrypted_secret = pgp.encrypt(client.secret,
2816
# A list of attributes that can not be pickled
2818
exclude = { "bus", "changedstate", "secret",
2819
"checker", "server_settings" }
2820
for name, typ in inspect.getmembers(dbus.service
2824
client_dict["encrypted_secret"] = (client
2826
for attr in client.client_structure:
2827
if attr not in exclude:
2828
client_dict[attr] = getattr(client, attr)
2830
clients[client.name] = client_dict
2831
del client_settings[client.name]["secret"]
2834
with tempfile.NamedTemporaryFile(
2838
dir=os.path.dirname(stored_state_path),
2839
delete=False) as stored_state:
2840
pickle.dump((clients, client_settings), stored_state)
2841
tempname = stored_state.name
2842
os.rename(tempname, stored_state_path)
2843
except (IOError, OSError) as e:
2849
if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2850
logger.warning("Could not save persistent state: {}"
2851
.format(os.strerror(e.errno)))
2853
logger.warning("Could not save persistent state:",
2857
# Delete all clients, and settings from config
2858
1943
while tcp_server.clients:
2859
name, client = tcp_server.clients.popitem()
1944
client = tcp_server.clients.pop()
2861
1946
client.remove_from_connection()
1947
client.disable_hook = None
2862
1948
# Don't signal anything except ClientRemoved
2863
1949
client.disable(quiet=True)
2865
1951
# Emit D-Bus signal
2866
mandos_dbus_service.ClientRemoved(
2867
client.dbus_object_path, client.name)
2868
client_settings.clear()
1952
mandos_dbus_service.ClientRemoved(client.dbus_object_path,
2870
1955
atexit.register(cleanup)
2872
for client in tcp_server.clients.itervalues():
1957
for client in tcp_server.clients:
2874
1959
# Emit D-Bus signal
2875
1960
mandos_dbus_service.ClientAdded(client.dbus_object_path)
2876
# Need to initiate checking of clients
2878
client.init_checker()
2880
1963
tcp_server.enable()
2881
1964
tcp_server.server_activate()
2883
1966
# Find out what port we got
2885
service.port = tcp_server.socket.getsockname()[1]
1967
service.port = tcp_server.socket.getsockname()[1]
2887
logger.info("Now listening on address %r, port %d,"
2888
" flowinfo %d, scope_id %d",
2889
*tcp_server.socket.getsockname())
1969
logger.info(u"Now listening on address %r, port %d,"
1970
" flowinfo %d, scope_id %d"
1971
% tcp_server.socket.getsockname())
2891
logger.info("Now listening on address %r, port %d",
2892
*tcp_server.socket.getsockname())
1973
logger.info(u"Now listening on address %r, port %d"
1974
% tcp_server.socket.getsockname())
2894
1976
#service.interface = tcp_server.socket.getsockname()[3]
2898
# From the Avahi example code
2901
except dbus.exceptions.DBusException as error:
2902
logger.critical("D-Bus Exception", exc_info=error)
2905
# End of Avahi example code
1979
# From the Avahi example code
1982
except dbus.exceptions.DBusException, error:
1983
logger.critical(u"DBusException: %s", error)
1986
# End of Avahi example code
2907
1988
gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2908
1989
lambda *args, **kwargs:
2909
1990
(tcp_server.handle_request
2910
1991
(*args[2:], **kwargs) or True))
2912
logger.debug("Starting main loop")
1993
logger.debug(u"Starting main loop")
2913
1994
main_loop.run()
2914
except AvahiError as error:
2915
logger.critical("Avahi Error", exc_info=error)
1995
except AvahiError, error:
1996
logger.critical(u"AvahiError: %s", error)
2918
1999
except KeyboardInterrupt:
2920
print("", file=sys.stderr)
2921
logger.debug("Server received KeyboardInterrupt")
2922
logger.debug("Server exiting")
2002
logger.debug(u"Server received KeyboardInterrupt")
2003
logger.debug(u"Server exiting")
2923
2004
# Must run before the D-Bus bus name gets deregistered
2927
2007
if __name__ == '__main__':