Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2024-12-26 07:49:48 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove mode settings from global settings object

Browse Source
This commit is contained in:
Micah Lee 2019-11-02 17:06:13 -07:00
parent 87918c5d89
commit b815b0e9e2
No known key found for this signature in database
GPG Key ID: 403C2657CD994F73
3 changed files with 2 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
onionshare/mode_settings.py
View File

@ -45,7 +45,7 @@ class ModeSettings:
"client_auth": False,
},
"share": {"autostop_sharing": True},
"receive": {"data_dir": self.build_default_data_dir()},
"receive": {"data_dir": self.build_default_receive_data_dir()},
"website": {"disable_csp": False},
}
@ -55,7 +55,7 @@ class ModeSettings:
def set(self, group, key, val):
self.settings[group][key] = val
def build_default_data_dir(self):
def build_default_receive_data_dir(self):
"""
Returns the path of the default Downloads directory for receive mode.
"""

12
onionshare/settings.py
View File

@ -106,24 +106,12 @@ class Settings(object):
"socket_file_path": "/var/run/tor/control",
"auth_type": "no_auth",
"auth_password": "",
"close_after_first_download": True,
"autostop_timer": False,
"autostart_timer": False,
"use_stealth": False,
"use_autoupdate": True,
"autoupdate_timestamp": None,
"no_bridges": True,
"tor_bridges_use_obfs4": False,
"tor_bridges_use_meek_lite_azure": False,
"tor_bridges_use_custom_bridges": "",
"use_legacy_v2_onions": False,
"save_private_key": False,
"private_key": "",
"public_mode": False,
"password": "",
"hidservauth_string": "",
"data_dir": "",
"csp_header_disabled": False,
"locale": None, # this gets defined in fill_in_defaults()
}
self._settings = {}

14
tests/test_onionshare_settings.py
View File

@ -50,24 +50,12 @@ class TestSettings:
"socket_file_path": "/var/run/tor/control",
"auth_type": "no_auth",
"auth_password": "",
"close_after_first_download": True,
"autostop_timer": False,
"autostart_timer": False,
"use_stealth": False,
"use_autoupdate": True,
"autoupdate_timestamp": None,
"no_bridges": True,
"tor_bridges_use_obfs4": False,
"tor_bridges_use_meek_lite_azure": False,
"tor_bridges_use_custom_bridges": "",
"use_legacy_v2_onions": False,
"save_private_key": False,
"private_key": "",
"password": "",
"hidservauth_string": "",
"data_dir": os.path.expanduser("~/OnionShare"),
"public_mode": False,
"csp_header_disabled": False,
}
for key in settings_obj._settings:
# Skip locale, it will not always default to the same thing
@ -125,8 +113,6 @@ class TestSettings:
assert settings_obj.get("socket_file_path") == "/var/run/tor/control"
assert settings_obj.get("auth_type") == "no_auth"
assert settings_obj.get("auth_password") == ""
assert settings_obj.get("close_after_first_download") is True
assert settings_obj.get("use_stealth") is False
assert settings_obj.get("use_autoupdate") is True
assert settings_obj.get("autoupdate_timestamp") is None
assert settings_obj.get("autoupdate_timestamp") is None