diff options
| author | Micah Lee <micah@micahflee.com> | 2021-10-24 20:23:38 -0700 |
|---|---|---|
| committer | Micah Lee <micah@micahflee.com> | 2021-10-24 20:23:38 -0700 |
| commit | e33fc49815d58548488675d7c409408cb5005e65 (patch) | |
| tree | 93845a5695a1e70ada4b85296534d6bb7fb1004c /cli/onionshare_cli/common.py | |
| parent | e6c7cc989f78a8de531a3cc7420eb9193abd9a06 (diff) | |
| parent | 10147b6c6b515231e74d866216818a8590ac5822 (diff) | |
| download | onionshare-e33fc49815d58548488675d7c409408cb5005e65.tar.gz onionshare-e33fc49815d58548488675d7c409408cb5005e65.zip | |
Merge branch 'censorship' into 1442_settings_tabs
Diffstat (limited to 'cli/onionshare_cli/common.py')
| -rw-r--r-- | cli/onionshare_cli/common.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/cli/onionshare_cli/common.py b/cli/onionshare_cli/common.py index 07e0aa0a..b76e72b2 100644 --- a/cli/onionshare_cli/common.py +++ b/cli/onionshare_cli/common.py @@ -22,6 +22,7 @@ import hashlib import os import platform import random +import requests import socket import sys import threading @@ -314,6 +315,7 @@ class Common: raise CannotFindTor() obfs4proxy_file_path = shutil.which("obfs4proxy") snowflake_file_path = shutil.which("snowflake-client") + meek_client_file_path = os.path.join(base_path, "meek-client") prefix = os.path.dirname(os.path.dirname(tor_path)) tor_geo_ip_file_path = os.path.join(prefix, "share/tor/geoip") tor_geo_ipv6_file_path = os.path.join(prefix, "share/tor/geoip6") @@ -322,6 +324,7 @@ class Common: tor_path = os.path.join(base_path, "Tor", "tor.exe") obfs4proxy_file_path = os.path.join(base_path, "Tor", "obfs4proxy.exe") snowflake_file_path = os.path.join(base_path, "Tor", "snowflake-client.exe") + meek_client_file_path = os.path.join(base_path, "Tor", "meek-client.exe") tor_geo_ip_file_path = os.path.join(base_path, "Data", "Tor", "geoip") tor_geo_ipv6_file_path = os.path.join(base_path, "Data", "Tor", "geoip6") elif self.platform == "Darwin": @@ -330,6 +333,7 @@ class Common: raise CannotFindTor() obfs4proxy_file_path = shutil.which("obfs4proxy") snowflake_file_path = shutil.which("snowflake-client") + meek_client_file_path = shutil.which("meek-client") prefix = os.path.dirname(os.path.dirname(tor_path)) tor_geo_ip_file_path = os.path.join(prefix, "share/tor/geoip") tor_geo_ipv6_file_path = os.path.join(prefix, "share/tor/geoip6") @@ -339,6 +343,7 @@ class Common: tor_geo_ipv6_file_path = "/usr/local/share/tor/geoip6" obfs4proxy_file_path = "/usr/local/bin/obfs4proxy" snowflake_file_path = "/usr/local/bin/snowflake-client" + meek_client_file_path = "/usr/local/bin/meek-client" return ( tor_path, @@ -346,6 +351,7 @@ class Common: tor_geo_ipv6_file_path, obfs4proxy_file_path, snowflake_file_path, + meek_client_file_path, ) def build_data_dir(self): |