ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-06-18 23:38:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Allow [storage]anonymous through the validator

Browse Source 
And provide a helpful accessor for reading it
This commit is contained in:
Jean-Paul Calderone
2019-07-03 14:30:36 -04:00
parent b50e20b58c
commit 853cf62530
2 changed files with 90 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/allmydata/client.py
View File

@ -97,6 +97,7 @@ _client_config = configutil.ValidConfiguration(
"storage": (
"debug_discard",
"enabled",
"anonymous",
"expire.cutoff_date",
"expire.enabled",
"expire.immutable",
@ -619,6 +620,31 @@ def _add_to_announcement(information, announceable_storage_server):
)
def storage_enabled(config):
"""
Is storage enabled according to the given configuration object?
:param _Config config: The configuration to inspect.
:return bool: ``True`` if storage is enabled, ``False`` otherwise.
"""
return config.get_config(b"storage", b"enabled", True, boolean=True)
def anonymous_storage_enabled(config):
"""
Is anonymous access to storage enabled according to the given
configuration object?
:param _Config config: The configuration to inspect.
:return bool: ``True`` if storage is enabled, ``False`` otherwise.
"""
return (
storage_enabled(config) and
config.get_config(b"storage", b"anonymous", True, boolean=True)
)
@implementer(IStatsProducer)
class _Client(node.Node, pollmixin.PollMixin):
@ -828,7 +854,7 @@ class _Client(node.Node, pollmixin.PollMixin):
def init_storage(self, announceable_storage_servers):
# should we run a storage server (and publish it for others to use)?
if not self.config.get_config("storage", "enabled", True, boolean=True):
if not storage_enabled(self.config):
return
if not self._is_tub_listening():
raise ValueError("config error: storage is enabled, but tub "