diff --git a/poetry.lock b/poetry.lock index 5434899..7b9ccb5 100644 --- a/poetry.lock +++ b/poetry.lock @@ -38,7 +38,7 @@ tests_no_zope = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (> [[package]] name = "babel" -version = "2.10.2" +version = "2.10.3" description = "Internationalization utilities" category = "main" optional = false @@ -64,7 +64,7 @@ lxml = ["lxml"] [[package]] name = "certifi" -version = "2022.5.18.1" +version = "2022.6.15" description = "Python package for providing Mozilla's CA Bundle." category = "main" optional = false @@ -83,7 +83,7 @@ unicode_backport = ["unicodedata2"] [[package]] name = "colorama" -version = "0.4.4" +version = "0.4.5" description = "Cross-platform colored terminal text." category = "main" optional = false @@ -126,7 +126,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" [[package]] name = "importlib-metadata" -version = "4.11.4" +version = "4.12.0" description = "Read metadata from Python packages" category = "main" optional = false @@ -139,15 +139,15 @@ zipp = ">=0.5" [package.extras] docs = ["sphinx", "jaraco.packaging (>=9)", "rst.linker (>=1.9)"] perf = ["ipython"] -testing = ["pytest (>=6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytest-cov", "pytest-enabler (>=1.0.1)", "packaging", "pyfakefs", "flufl.flake8", "pytest-perf (>=0.9.2)", "pytest-black (>=0.3.7)", "pytest-mypy (>=0.9.1)", "importlib-resources (>=1.3)"] +testing = ["pytest (>=6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytest-cov", "pytest-enabler (>=1.3)", "packaging", "pyfakefs", "flufl.flake8", "pytest-perf (>=0.9.2)", "pytest-black (>=0.3.7)", "pytest-mypy (>=0.9.1)", "importlib-resources (>=1.3)"] [[package]] name = "jinja2" -version = "3.1.2" +version = "3.0.3" description = "A very fast and expressive template engine." category = "main" optional = false -python-versions = ">=3.7" +python-versions = ">=3.6" [package.dependencies] MarkupSafe = ">=2.0" @@ -491,20 +491,21 @@ prompt = ["sphinx-prompt (>=0.1)"] [[package]] name = "sphinx-tabs" -version = "3.3.1" +version = "3.4.0" description = "Tabbed views for Sphinx" category = "main" optional = false -python-versions = "~=3.6" +python-versions = "~=3.7" [package.dependencies] docutils = ">=0.17.0,<0.18.0" +jinja2 = "<3.1.0" pygments = "*" -sphinx = ">=2,<5" +sphinx = ">=2,<6" [package.extras] code_style = ["pre-commit (==2.13.0)"] -testing = ["coverage", "pytest (>=3.6,<4)", "pytest-cov", "pytest-regressions", "pygments", "sphinx-testing", "bs4", "rinohtype"] +testing = ["coverage", "pytest (>=7.1,<8)", "pytest-cov", "pytest-regressions", "pygments", "sphinx-testing", "bs4", "rinohtype"] [[package]] name = "sphinxcontrib-applehelp" @@ -675,24 +676,24 @@ attrs = [ {file = "attrs-21.4.0.tar.gz", hash = "sha256:626ba8234211db98e869df76230a137c4c40a12d72445c45d5f5b716f076e2fd"}, ] babel = [ - {file = "Babel-2.10.2-py3-none-any.whl", hash = "sha256:81a3beca4d0cd40a9cfb9e2adb2cf39261c2f959b92e7a74750befe5d79afd7b"}, - {file = "Babel-2.10.2.tar.gz", hash = "sha256:7aed055f0c04c9e7f51a2f75261e41e1c804efa724cb65b60a970dd4448d469d"}, + {file = "Babel-2.10.3-py3-none-any.whl", hash = "sha256:ff56f4892c1c4bf0d814575ea23471c230d544203c7748e8c68f0089478d48eb"}, + {file = "Babel-2.10.3.tar.gz", hash = "sha256:7614553711ee97490f732126dc077f8d0ae084ebc6a96e23db1482afabdb2c51"}, ] beautifulsoup4 = [ {file = "beautifulsoup4-4.11.1-py3-none-any.whl", hash = "sha256:58d5c3d29f5a36ffeb94f02f0d786cd53014cf9b3b3951d42e0080d8a9498d30"}, {file = "beautifulsoup4-4.11.1.tar.gz", hash = "sha256:ad9aa55b65ef2808eb405f46cf74df7fcb7044d5cbc26487f96eb2ef2e436693"}, ] certifi = [ - {file = "certifi-2022.5.18.1-py3-none-any.whl", hash = "sha256:f1d53542ee8cbedbe2118b5686372fb33c297fcd6379b050cca0ef13a597382a"}, - {file = "certifi-2022.5.18.1.tar.gz", hash = "sha256:9c5705e395cd70084351dd8ad5c41e65655e08ce46f2ec9cf6c2c08390f71eb7"}, + {file = "certifi-2022.6.15-py3-none-any.whl", hash = "sha256:fe86415d55e84719d75f8b69414f6438ac3547d2078ab91b67e779ef69378412"}, + {file = "certifi-2022.6.15.tar.gz", hash = "sha256:84c85a9078b11105f04f3036a9482ae10e4621616db313fe045dd24743a0820d"}, ] charset-normalizer = [ {file = "charset-normalizer-2.0.12.tar.gz", hash = "sha256:2857e29ff0d34db842cd7ca3230549d1a697f96ee6d3fb071cfa6c7393832597"}, {file = "charset_normalizer-2.0.12-py3-none-any.whl", hash = "sha256:6881edbebdb17b39b4eaaa821b438bf6eddffb4468cf344f09f89def34a8b1df"}, ] colorama = [ - {file = "colorama-0.4.4-py2.py3-none-any.whl", hash = "sha256:9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2"}, - {file = "colorama-0.4.4.tar.gz", hash = "sha256:5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b"}, + {file = "colorama-0.4.5-py2.py3-none-any.whl", hash = "sha256:854bf444933e37f5824ae7bfc1e98d5bce2ebe4160d46b5edf346a89358e99da"}, + {file = "colorama-0.4.5.tar.gz", hash = "sha256:e6c6b4334fc50988a639d9b98aa429a0b57da6e17b9a44f0451f930b6967b7a4"}, ] commonmark = [ {file = "commonmark-0.9.1-py2.py3-none-any.whl", hash = "sha256:da2f38c92590f83de410ba1a3cbceafbc74fee9def35f9251ba9a971d6d66fd9"}, @@ -711,12 +712,12 @@ imagesize = [ {file = "imagesize-1.3.0.tar.gz", hash = "sha256:cd1750d452385ca327479d45b64d9c7729ecf0b3969a58148298c77092261f9d"}, ] importlib-metadata = [ - {file = "importlib_metadata-4.11.4-py3-none-any.whl", hash = "sha256:c58c8eb8a762858f49e18436ff552e83914778e50e9d2f1660535ffb364552ec"}, - {file = "importlib_metadata-4.11.4.tar.gz", hash = "sha256:5d26852efe48c0a32b0509ffbc583fda1a2266545a78d104a6f4aff3db17d700"}, + {file = "importlib_metadata-4.12.0-py3-none-any.whl", hash = "sha256:7401a975809ea1fdc658c3aa4f78cc2195a0e019c5cbc4c06122884e9ae80c23"}, + {file = "importlib_metadata-4.12.0.tar.gz", hash = "sha256:637245b8bab2b6502fcbc752cc4b7a6f6243bb02b31c5c26156ad103d3d45670"}, ] jinja2 = [ - {file = "Jinja2-3.1.2-py3-none-any.whl", hash = "sha256:6088930bfe239f0e6710546ab9c19c9ef35e29792895fed6e6e31a023a182a61"}, - {file = "Jinja2-3.1.2.tar.gz", hash = "sha256:31351a702a408a9e7595a8fc6150fc3f43bb6bf7e319770cbc0db9df9437e852"}, + {file = "Jinja2-3.0.3-py3-none-any.whl", hash = "sha256:077ce6014f7b40d03b47d1f1ca4b0fc8328a692bd284016f806ed0eaca390ad8"}, + {file = "Jinja2-3.0.3.tar.gz", hash = "sha256:611bb273cd68f3b993fabdc4064fc858c5b47a973cb5aa7999ec1ba405c87cd7"}, ] livereload = [ {file = "livereload-2.6.3.tar.gz", hash = "sha256:776f2f865e59fde56490a56bcc6773b6917366bce0c267c60ee8aaf1a0959869"}, @@ -891,8 +892,8 @@ sphinx-substitution-extensions = [ {file = "Sphinx_Substitution_Extensions-2022.2.16-py3-none-any.whl", hash = "sha256:5a8ca34dac3984486344e95c36e3ed4766d402a71bdee7390d600f153db9795b"}, ] sphinx-tabs = [ - {file = "sphinx-tabs-3.3.1.tar.gz", hash = "sha256:d10dd7fb2700329b8e5948ab9f8e3ef54fff30f79d2e42cfd1b0089ae26e8c5e"}, - {file = "sphinx_tabs-3.3.1-py3-none-any.whl", hash = "sha256:73209aa769246501f6de9e33051cfd2d54f5900e0cc28a63367d8e4af4c0db5d"}, + {file = "sphinx-tabs-3.4.0.tar.gz", hash = "sha256:75e97ce10b74700deaf87b662539a293c8afc9dfa9d21f126b860118064cb0c5"}, + {file = "sphinx_tabs-3.4.0-py3-none-any.whl", hash = "sha256:31dbe7594b5ef4cfa76a7960448d4607dca167ff21467000213920572c302072"}, ] sphinxcontrib-applehelp = [ {file = "sphinxcontrib-applehelp-1.0.2.tar.gz", hash = "sha256:a072735ec80e7675e3f432fcae8610ecf509c5f1869d17e2eecff44389cdbc58"}, diff --git a/site/source/_static/images/tor/ios-orbot-connecting-full.png b/site/source/_static/images/tor/ios-orbot-connecting-full.png new file mode 100644 index 0000000..f33b7fa Binary files /dev/null and b/site/source/_static/images/tor/ios-orbot-connecting-full.png differ diff --git a/site/source/_static/images/tor/ios-orbot-settings-oniononlymode.png b/site/source/_static/images/tor/ios-orbot-settings-oniononlymode.png new file mode 100644 index 0000000..5d71f62 Binary files /dev/null and b/site/source/_static/images/tor/ios-orbot-settings-oniononlymode.png differ diff --git a/site/source/user-manual/connecting/connecting-tor/tor-firefox/torff-ios.rst b/site/source/user-manual/connecting/connecting-tor/tor-firefox/torff-ios.rst index 4a0c9f7..fef8b12 100644 --- a/site/source/user-manual/connecting/connecting-tor/tor-firefox/torff-ios.rst +++ b/site/source/user-manual/connecting/connecting-tor/tor-firefox/torff-ios.rst @@ -4,4 +4,9 @@ Configuring Firefox for Tor on iOS ================================== -Unfortunately, it is not currently possible to run Tor natively on iOS. This means that Firefox cannot be configured to use tor. Please see :ref:`iOS Limitations` for details and workarounds. +.. caution:: + This guide assumes you have completed :ref:`setting up Tor for iOS`. Please visit this section before proceeding as it is required for any regular browser such as Firefox to properly work with Tor. + +Once Orbot is setup on your system as illustrated at the link above, you don't need to do anything special to have firefox or any other browser proxied via tor. It should just work for any given onion url. + + diff --git a/site/source/user-manual/connecting/connecting-tor/tor-os/tor-android.rst b/site/source/user-manual/connecting/connecting-tor/tor-os/tor-android.rst index d1c3824..bc5a7a1 100644 --- a/site/source/user-manual/connecting/connecting-tor/tor-os/tor-android.rst +++ b/site/source/user-manual/connecting/connecting-tor/tor-os/tor-android.rst @@ -44,7 +44,7 @@ Orbot is a system wide proxy for your Android device that enables communications :width: 50% :alt: Orbot started -7. That's it, you're now running a Tor client on your Android device! Certain apps, such as Firefox, Fennec, and DuckDuckGo will now just work. Other apps, however, require that Orbot be running VPN mode. +7. That's it, you're now running a Tor client on your Android device! Certain apps, such as Firefox, Fennec, and DuckDuckGo will now work after you configure them to use Tor's local proxy. Other apps do not have sophisticated proxy configurations and require that Orbot be running in VPN mode. Orbot VPN mode -------------- @@ -78,9 +78,11 @@ Under `Tor-Enabled Apps`, click the gear icon and add apps you want to utilize T Examples of applications that need this feature are: - Bitwarden -- Element (Matrix) +- Element (Matrix client) You can also add the following browsers to the Tor-Enabled Apps list to easily access Tor addresses (`.onion` URLs): - Chrome - Vanadium + + .. caution:: Pushing apps through Orbot's VPN mode will allow you to access .onion URLs, however, all other traffic will also go through Tor. This means connections to some sites may be blocked by site operators' fraud prevention measures, especially e-commerce sites where credit cards are used. Proceed with caution especially for Web Browsers. \ No newline at end of file diff --git a/site/source/user-manual/connecting/connecting-tor/tor-os/tor-ios.rst b/site/source/user-manual/connecting/connecting-tor/tor-os/tor-ios.rst index 1036306..0405aa5 100644 --- a/site/source/user-manual/connecting/connecting-tor/tor-os/tor-ios.rst +++ b/site/source/user-manual/connecting/connecting-tor/tor-os/tor-ios.rst @@ -4,4 +4,21 @@ Running Tor on iOS ================== -Unfortunately, it is not currently possible to run Tor natively on iOS. Please see :ref:`iOS Limitations` for details and workarounds. +*Orbot has been released for iOS so it is now possible to run Tor natively on iOS.* + +1. Download and install `Orbot from the Apple appstore `_. +2. Open Orbot +3. Select Settings +4. Activate the "Disable Orbot for non-onion traffic" setting: + + .. figure:: /_static/images/tor/ios-orbot-settings-oniononlymode.png + :width: 50% + :alt: iOS Orbot -> Settings -> Onion-Only Mode + +5. Go back to the main screen and click "Start" and you will see Tor connect: + + .. figure:: /_static/images/tor/ios-orbot-connecting-full.png + :width: 50% + :alt: iOS Orbot Connecting to Tor + +6. Apps will now work transparently when requesting onion urls. diff --git a/site/source/user-manual/device-guides/limitations/lim-ios.rst b/site/source/user-manual/device-guides/limitations/lim-ios.rst index 1d1cc96..e454fcf 100644 --- a/site/source/user-manual/device-guides/limitations/lim-ios.rst +++ b/site/source/user-manual/device-guides/limitations/lim-ios.rst @@ -8,12 +8,4 @@ iOS :depth: 2 :local: -Tor ---- -It is not currently possible to run Tor natively (in the background) on iOS. This means that many iOS apps will be unable to connect to your Embassy. The best chance for a Tor background process on iOS in the future is via the `iCepa Project `_. - -Many apps, such as :ref:`Fully Noded ` and :ref:`Zap `, support Tor natively, and any Embassy service that has a Tor UI can be accessed using `Onion Browser `_. - -Matrix ------- -The lack of background Tor support on iOS means that you cannot use `Element `_ to connect to your Embassy Matrix server. This will be fixed when `Element introduces Tor support `_ or when `iCepa Project `_ comes to fruition. +iOS has no known limitations in regard to Embassy.