def addCommands(template):
"""Add some text telling a client about supported email command, as well as
which Pluggable Transports are currently available.
"""
# Tell them about the various email commands:
cmdlist = []
cmdlist.append(template.gettext(strings.EMAIL_MISC_TEXT.get(3)))
for cmd, desc in strings.EMAIL_COMMANDS.items():
command = ' '
command += cmd
while not len(command) >= 25: # Align the command descriptions
command += ' '
command += template.gettext(desc)
cmdlist.append(command)
commands = "\n".join(cmdlist) + "\n\n"
# And include the currently supported transports:
commands += template.gettext(strings.EMAIL_MISC_TEXT.get(5))
commands += "\n"
for pt in strings._getSupportedTransports():
commands += ' ' + pt + "\n"
return commands
def addCommands(template):
"""Add some text telling a client about supported email command, as well as
which Pluggable Transports are currently available.
"""
# Tell them about the various email commands:
cmdlist = []
cmdlist.append(template.gettext(strings.EMAIL_MISC_TEXT.get(3)))
for cmd, desc in strings.EMAIL_COMMANDS.items():
command = ' '
command += cmd
while not len(command) >= 25: # Align the command descriptions
command += ' '
command += template.gettext(desc)
cmdlist.append(command)
commands = "\n".join(cmdlist) + "\n\n"
# And include the currently supported transports:
commands += template.gettext(strings.EMAIL_MISC_TEXT.get(5))
commands += "\n"
for pt in strings._getSupportedTransports():
commands += ' ' + pt + "\n"
return commands
def loadConfig(configFile=None, configCls=None):
"""Load configuration settings on top of the current settings.
All pathnames and filenames within settings in the ``configFile`` will be
expanded, and their expanded values will be stored in the returned
:class:`config <Conf>` object.
** Note: **
On the strange-looking use of
``exec compile(open(configFile).read(), '<string>', 'exec') in dict()``
in this function:
The contents of the config file should be compiled first, and then
``exec``ed -- not ``execfile``! -- in order to get the contents of the
config file to exist within the scope of the configuration dictionary.
Otherwise, Python *will* default_ to executing the config file directly
within the ``globals()`` scope.
Additionally, it's roughly 20-30 times faster_ to use the ``compile``
builtin on a string (the contents of the file) before ``exec``ing it, than
using ``execfile`` directly on the file.
.. _default: http://stackoverflow.com/q/17470193
.. _faster: http://lucumr.pocoo.org/2011/2/1/exec-in-python/
:ivar boolean itsSafeToUseLogging: This is called in
:func:`~bridgedb.Main.run` before
:func:`bridgedb.safelog.configureLogging`. When called from
:func:`~bridgedb.Main.run`, the **configCls** parameter is not given,
because that is the first time that a :class:`Conf` is created. If a
:class:`logging.Logger` is created in this function, then logging will
not be correctly configured, therefore, if the **configCls** parameter
is not given, then it's the first time this function has been called
and it is therefore not safe to make calls to the logging module.
:type: configFile: string or None
:param configFile: If given, the filename of the config file to load.
:type configCls: :class:`Conf` or None
:param configCls: The current configuration instance, if one already
exists.
:returns: A new :class:`configuration <bridgedb.configure.Conf>`, with the
old settings as defaults, and the settings from the **configFile** (if
given) overriding those defaults.
"""
itsSafeToUseLogging = False
configuration = {}
if configCls:
itsSafeToUseLogging = True
oldConfig = configCls.__dict__
configuration.update(**oldConfig) # Load current settings
logging.info("Reloading over in-memory configurations...")
conffile = configFile
if (configFile is None) and ('CONFIG_FILE' in configuration):
conffile = configuration['CONFIG_FILE']
if conffile is not None:
if itsSafeToUseLogging:
logging.info("Loading settings from config file: '%s'" % conffile)
compiled = compile(open(conffile).read(), '<string>', 'exec')
exec compiled in configuration
if itsSafeToUseLogging:
logging.debug("New configuration settings:")
logging.debug("\n".join(["{0} = {1}".format(key, value)
for key, value in configuration.items()
if not key.startswith('_')]))
# Create a :class:`Conf` from the settings stored within the local scope
# of the ``configuration`` dictionary:
config = Conf(**configuration)
# We want to set the updated/expanded paths for files on the ``config``,
# because the copy of this config, `state.config` is used later to compare
# with a new :class:`Conf` instance, to see if there were any changes.
#
# See :meth:`bridgedb.persistent.State.useUpdatedSettings`.
for attr in ["PROXY_LIST_FILES", "BRIDGE_FILES", "EXTRA_INFO_FILES"]:
setting = getattr(config, attr, None)
if setting is None: # pragma: no cover
setattr(config, attr, []) # If they weren't set, make them lists
else:
setattr(config, attr, # If they were set, expand the paths:
[os.path.abspath(os.path.expanduser(f)) for f in setting])
for attr in ["DB_FILE", "DB_LOG_FILE", "MASTER_KEY_FILE", "PIDFILE",
"ASSIGNMENTS_FILE", "HTTPS_CERT_FILE", "HTTPS_KEY_FILE",
"LOG_FILE", "STATUS_FILE", "COUNTRY_BLOCK_FILE",
"GIMP_CAPTCHA_DIR", "GIMP_CAPTCHA_HMAC_KEYFILE",
"GIMP_CAPTCHA_RSA_KEYFILE", "EMAIL_GPG_HOMEDIR",
"EMAIL_GPG_PASSPHRASE_FILE"]:
setting = getattr(config, attr, None)
if setting is None:
setattr(config, attr, setting)
else:
setattr(config, attr, os.path.abspath(os.path.expanduser(setting)))
for attr in ["HTTPS_ROTATION_PERIOD", "EMAIL_ROTATION_PERIOD"]:
setting = getattr(config, attr, None) # Default to None
setattr(config, attr, setting)
for attr in ["IGNORE_NETWORKSTATUS"]:
setting = getattr(config, attr, True) # Default to True
setattr(config, attr, setting)
for attr in ["FORCE_PORTS", "FORCE_FLAGS", "NO_DISTRIBUTION_COUNTRIES"]:
setting = getattr(config, attr, []) # Default to empty lists
setattr(config, attr, setting)
for attr in ["SUPPORTED_TRANSPORTS"]:
setting = getattr(config, attr, {}) # Default to empty dicts
setattr(config, attr, setting)
# Set the SUPPORTED_TRANSPORTS to populate the webserver and email options:
strings._setSupportedTransports(getattr(config, "SUPPORTED_TRANSPORTS", {}))
strings._setDefaultTransport(getattr(config, "DEFAULT_TRANSPORT", ""))
logging.info("Currently supported transports: %s" %
" ".join(strings._getSupportedTransports()))
logging.info("Default transport: %s" % strings._getDefaultTransport())
for domain in config.EMAIL_DOMAINS:
config.EMAIL_DOMAIN_MAP[domain] = domain
if conffile: # Store the pathname of the config file, if one was used
config.CONFIG_FILE = os.path.abspath(os.path.expanduser(conffile))
return config
def loadConfig(configFile=None, configCls=None):
"""Load configuration settings on top of the current settings.
All pathnames and filenames within settings in the ``configFile`` will be
expanded, and their expanded values will be stored in the returned
:class:`configuration <bridgedb.configure.Conf>` object.
**Note:**
On the strange-looking use of::
exec compile(open(configFile).read(), '<string>', 'exec') in dict()
in this function…
The contents of the config file should be compiled first, and then passed
to ``exec()`` -- not ``execfile()`` ! -- in order to get the contents of
the config file to exist within the scope of the configuration dictionary.
Otherwise, Python *will* default_ to executing the config file directly
within the ``globals()`` scope.
Additionally, it's roughly 20-30 times faster_ to use the ``compile()``
builtin on a string (the contents of the file) before passing it to
``exec()``, than using ``execfile()`` directly on the file.
.. _default: http://stackoverflow.com/q/17470193
.. _faster: http://lucumr.pocoo.org/2011/2/1/exec-in-python/
:ivar bool itsSafeToUseLogging: This is called in
:func:`bridgedb.main.run` before
:func:`bridgedb.safelog.configureLogging`. When called from
:func:`~bridgedb.main.run`, the **configCls** parameter is not given,
because that is the first time that a
:class:`config <bridgedb.configure.Conf>` has been created. If a
:class:`logging.Logger` is created in this function, then logging will
not be correctly configured, therefore, if the **configCls** parameter
is not given, then it's the first time this function has been called
and it is therefore *not* safe to make calls to the logging module.
:type configFile: :any:`str` or ``None``
:param configFile: If given, the filename of the config file to load.
:type configCls: :class:`bridgedb.configure.Conf` or ``None``
:param configCls: The current configuration instance, if one already
exists.
:returns: A new :class:`configuration <bridgedb.configure.Conf>`, with the
old settings as defaults, and the settings from the **configFile** (if
given) overriding those defaults.
"""
itsSafeToUseLogging = False
configuration = {}
if configCls:
itsSafeToUseLogging = True
oldConfig = configCls.__dict__
configuration.update(**oldConfig) # Load current settings
logging.info("Reloading over in-memory configurations...")
conffile = configFile
if (configFile is None) and ('CONFIG_FILE' in configuration):
conffile = configuration['CONFIG_FILE']
if conffile is not None:
if itsSafeToUseLogging:
logging.info("Loading settings from config file: '%s'" % conffile)
compiled = compile(open(conffile).read(), '<string>', 'exec')
exec(compiled, configuration)
if itsSafeToUseLogging:
logging.debug("New configuration settings:")
logging.debug("\n".join([
"{0} = {1}".format(key, value)
for key, value in configuration.items() if not key.startswith('_')
]))
# Create a :class:`Conf` from the settings stored within the local scope
# of the ``configuration`` dictionary:
config = Conf(**configuration)
# We want to set the updated/expanded paths for files on the ``config``,
# because the copy of this config, `state.config` is used later to compare
# with a new :class:`Conf` instance, to see if there were any changes.
#
# See :meth:`bridgedb.persistent.State.useUpdatedSettings`.
for attr in ["PROXY_LIST_FILES"]:
setting = getattr(config, attr, None)
if setting is None: # pragma: no cover
setattr(config, attr, []) # If they weren't set, make them lists
else:
setattr(
config,
attr, # If they were set, expand the paths:
[os.path.abspath(os.path.expanduser(f)) for f in setting])
for attr in [
"DB_FILE", "DB_LOG_FILE", "MASTER_KEY_FILE", "PIDFILE",
"ASSIGNMENTS_FILE", "HTTPS_CERT_FILE", "HTTPS_KEY_FILE",
"MOAT_CERT_FILE", "MOAT_KEY_FILE", "LOG_FILE",
"COUNTRY_BLOCK_FILE", "GIMP_CAPTCHA_DIR",
"GIMP_CAPTCHA_HMAC_KEYFILE", "GIMP_CAPTCHA_RSA_KEYFILE",
"EMAIL_GPG_HOMEDIR", "EMAIL_GPG_PASSPHRASE_FILE",
"NO_DISTRIBUTION_FILE"
]:
setting = getattr(config, attr, None)
if setting is None:
setattr(config, attr, setting)
else:
setattr(config, attr, os.path.abspath(os.path.expanduser(setting)))
for attr in [
"MOAT_ROTATION_PERIOD", "HTTPS_ROTATION_PERIOD",
"EMAIL_ROTATION_PERIOD"
]:
setting = getattr(config, attr, None) # Default to None
setattr(config, attr, setting)
for attr in [
"IGNORE_NETWORKSTATUS", "MOAT_CSP_ENABLED", "MOAT_CSP_REPORT_ONLY",
"MOAT_CSP_INCLUDE_SELF", "CSP_ENABLED", "CSP_REPORT_ONLY",
"CSP_INCLUDE_SELF"
]:
setting = getattr(config, attr, True) # Default to True
setattr(config, attr, setting)
for attr in ["FORCE_PORTS", "FORCE_FLAGS", "NO_DISTRIBUTION_COUNTRIES"]:
setting = getattr(config, attr, []) # Default to empty lists
setattr(config, attr, setting)
for attr in ["SUPPORTED_TRANSPORTS"]:
setting = getattr(config, attr, {}) # Default to empty dicts
setattr(config, attr, setting)
# Set the SUPPORTED_TRANSPORTS to populate the webserver and email options:
strings._setSupportedTransports(getattr(config, "SUPPORTED_TRANSPORTS",
{}))
strings._setDefaultTransport(getattr(config, "DEFAULT_TRANSPORT", ""))
logging.info("Currently supported transports: %s" %
" ".join(strings._getSupportedTransports()))
logging.info("Default transport: %s" % strings._getDefaultTransport())
for domain in config.EMAIL_DOMAINS:
config.EMAIL_DOMAIN_MAP[domain] = domain
if conffile: # Store the pathname of the config file, if one was used
config.CONFIG_FILE = os.path.abspath(os.path.expanduser(conffile))
return config
