diff --git a/poetry.lock b/poetry.lock index 2f3bb2b..a33eea8 100644 --- a/poetry.lock +++ b/poetry.lock @@ -72,7 +72,7 @@ python-versions = "*" [[package]] name = "charset-normalizer" -version = "2.0.10" +version = "2.0.11" description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet." category = "main" optional = false @@ -649,8 +649,8 @@ certifi = [ {file = "certifi-2021.10.8.tar.gz", hash = "sha256:78884e7c1d4b00ce3cea67b44566851c4343c120abd683433ce934a68ea58872"}, ] charset-normalizer = [ - {file = "charset-normalizer-2.0.10.tar.gz", hash = "sha256:876d180e9d7432c5d1dfd4c5d26b72f099d503e8fcc0feb7532c9289be60fcbd"}, - {file = "charset_normalizer-2.0.10-py3-none-any.whl", hash = "sha256:cb957888737fc0bbcd78e3df769addb41fd1ff8cf950dc9e7ad7793f1bf44455"}, + {file = "charset-normalizer-2.0.11.tar.gz", hash = "sha256:98398a9d69ee80548c762ba991a4728bfc3836768ed226b3945908d1a688371c"}, + {file = "charset_normalizer-2.0.11-py3-none-any.whl", hash = "sha256:2842d8f5e82a1f6aa437380934d5e1cd4fcf2003b06fed6940769c164a480a45"}, ] colorama = [ {file = "colorama-0.4.4-py2.py3-none-any.whl", hash = "sha256:9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2"}, diff --git a/site/03-todo.md b/site/03-todo.md index 1485600..1532b9b 100644 --- a/site/03-todo.md +++ b/site/03-todo.md @@ -1,4 +1,5 @@ # TODO +- LAN Setup - Android - Screenshots of LAN setup and verify steps on an Android 12+ device (see below) - Update all guides in service repos - Service-specific Guides (link to wrapper repos) - Verify LAN and Tor setup steps on a Mac @@ -6,10 +7,8 @@ - Add / verify ALL links in the **UI** go to the right place in docs # BLOCKED: -- LAN Setup - Android - Screenshots of LAN setup and verify steps on an Android 12+ device - Mission / values - Initial Setup -- DIY Guide - Possible sounds in troubleshooting (and walkthrough?) - Migration / Recovery - Backups @@ -26,13 +25,3 @@ - Create badges for device guide topic boxes - There are many issues that should be closed by 0.3 docs release (some issues await new processes in order to test) - Email signup - - -- download "Embassy Local CA.crt" from settings (must be done over desktop/laptop Tor) -- send cert to self via Telegram, email, cloud storage, etc -- download cert on Android device -- go to Settings -> Security -> Advanced -> Encryption and Credentials -> Install a Certificate -- Selected cert from file system -- In Firefox, enter about:config in URL bar -- search for security.enterprise_roots.enabled and set to true -It will be the same for 0.3.0 except they can also get the cert in the final step of setup or from the downloaded file from setup diff --git a/site/source/_static/images/ssl/android/droidLAN0.svg b/site/source/_static/images/ssl/android/droidLAN0.svg new file mode 100644 index 0000000..732031c Binary files /dev/null and b/site/source/_static/images/ssl/android/droidLAN0.svg differ diff --git a/site/source/_static/images/ssl/android/droidLAN1.svg b/site/source/_static/images/ssl/android/droidLAN1.svg new file mode 100644 index 0000000..d11bb7b Binary files /dev/null and b/site/source/_static/images/ssl/android/droidLAN1.svg differ diff --git a/site/source/_static/images/ssl/macos/embassy_lan_setup.svg b/site/source/_static/images/ssl/embassy_lan_setup.svg similarity index 100% rename from site/source/_static/images/ssl/macos/embassy_lan_setup.svg rename to site/source/_static/images/ssl/embassy_lan_setup.svg diff --git a/site/source/_static/images/ssl/macos/embassy_lan_setup0.svg b/site/source/_static/images/ssl/embassy_lan_setup0.svg similarity index 100% rename from site/source/_static/images/ssl/macos/embassy_lan_setup0.svg rename to site/source/_static/images/ssl/embassy_lan_setup0.svg diff --git a/site/source/_static/images/ssl/macos/embassy_lan_setup1.svg b/site/source/_static/images/ssl/embassy_lan_setup1.svg similarity index 100% rename from site/source/_static/images/ssl/macos/embassy_lan_setup1.svg rename to site/source/_static/images/ssl/embassy_lan_setup1.svg diff --git a/site/source/_static/images/ssl/mobile/ssl_certificate_install_page.svg b/site/source/_static/images/ssl/ios/ssl_certificate_install_page.svg similarity index 100% rename from site/source/_static/images/ssl/mobile/ssl_certificate_install_page.svg rename to site/source/_static/images/ssl/ios/ssl_certificate_install_page.svg diff --git a/site/source/_static/images/ssl/mobile/ssl_ipad_cert_trust.svg b/site/source/_static/images/ssl/ios/ssl_ipad_cert_trust.svg similarity index 100% rename from site/source/_static/images/ssl/mobile/ssl_ipad_cert_trust.svg rename to site/source/_static/images/ssl/ios/ssl_ipad_cert_trust.svg diff --git a/site/source/_static/images/ssl/mobile/ssl_ipad_cert_trust_settings.svg b/site/source/_static/images/ssl/ios/ssl_ipad_cert_trust_settings.svg similarity index 100% rename from site/source/_static/images/ssl/mobile/ssl_ipad_cert_trust_settings.svg rename to site/source/_static/images/ssl/ios/ssl_ipad_cert_trust_settings.svg diff --git a/site/source/_static/images/ssl/mobile/ssl_ipad_general_settings.svg b/site/source/_static/images/ssl/ios/ssl_ipad_general_settings.svg similarity index 100% rename from site/source/_static/images/ssl/mobile/ssl_ipad_general_settings.svg rename to site/source/_static/images/ssl/ios/ssl_ipad_general_settings.svg diff --git a/site/source/_static/images/ssl/mobile/ssl_ipad_install_profile.svg b/site/source/_static/images/ssl/ios/ssl_ipad_install_profile.svg similarity index 100% rename from site/source/_static/images/ssl/mobile/ssl_ipad_install_profile.svg rename to site/source/_static/images/ssl/ios/ssl_ipad_install_profile.svg diff --git a/site/source/_static/images/ssl/mobile/ssl_ipad_profiles.svg b/site/source/_static/images/ssl/ios/ssl_ipad_profiles.svg similarity index 100% rename from site/source/_static/images/ssl/mobile/ssl_ipad_profiles.svg rename to site/source/_static/images/ssl/ios/ssl_ipad_profiles.svg diff --git a/site/source/support/dev-docs/service-packaging/config.rst b/site/source/support/dev-docs/service-packaging/config.rst index ab3b435..363c1cb 100644 --- a/site/source/support/dev-docs/service-packaging/config.rst +++ b/site/source/support/dev-docs/service-packaging/config.rst @@ -29,7 +29,7 @@ Config Spec Overview ........ -.. figure:: /_static/images/service/bitcoin_config.png +.. figure:: /_static/images/services/config.svg :width: 80% :alt: Bitcoin Config diff --git a/site/source/support/user-manual/configuration/lan-setup/lan-os/lan-android.rst b/site/source/support/user-manual/configuration/lan-setup/lan-os/lan-android.rst index 3288b7d..4fa9182 100644 --- a/site/source/support/user-manual/configuration/lan-setup/lan-os/lan-android.rst +++ b/site/source/support/user-manual/configuration/lan-setup/lan-os/lan-android.rst @@ -4,5 +4,32 @@ Android ======= -If you are running Android 12+, you can setup :ref:`Local Access`, please refer to :ref:`Android Limitations ` for more details on devices that have this capability. +If you are running Android 12+ (not yet available on Calyx/Graphene), you can setup :ref:`Local Access`, please refer to :ref:`Android Limitations ` for more details. +.. note:: You must download your certificate via desktop/laptop over Tor and then transfer it to your phone (Step 3) + +#. Either use the Root CA you downloaded at the completion of :ref:`Initial Setup`, or visit your Embassy at its Tor Address (for security purposes), and navigate to the :ref:`Embassy tab` -> LAN + + .. figure:: /_static/images/ssl/embassy_lan_setup.svg + :width: 60% + :alt: LAN setup menu item + +#. Click "Download Root CA". This will prompt a download to save the certificate file to your machine + + .. figure:: /_static/images/ssl/embassy_lan_setup0.svg + :width: 60% + :alt: LAN setup page + +#. Send the cert to yourself via Signal, email, File Browser, etc and download onto your Android device + +#. Go to Settings -> Security -> Advanced -> Encryption and Credentials -> Install a Certificate and select the cert you downloaded from the file system + + .. figure:: /_static/images/ssl/android/droidLAN0.svg + :width: 30% + Install certificate + +#. To setup in Firefox, enter ``about:config`` in URL bar, search for "security.enterprise_roots.enabled", and set to ``true`` + + .. figure:: /_static/images/ssl/android/droidLAN1.svg + :width: 30% + Firefox about:config diff --git a/site/source/support/user-manual/configuration/lan-setup/lan-os/lan-ios.rst b/site/source/support/user-manual/configuration/lan-setup/lan-os/lan-ios.rst index 6c1059e..b41f490 100644 --- a/site/source/support/user-manual/configuration/lan-setup/lan-os/lan-ios.rst +++ b/site/source/support/user-manual/configuration/lan-setup/lan-os/lan-ios.rst @@ -14,13 +14,13 @@ iOS #. In the ``Embassy`` tab in your Embassy, under ``Settings`` -> ``LAN`` - .. figure:: /_static/images/embassy_lan_setup.svg + .. figure:: /_static/images/ssl/embassy_lan_setup.svg :width: 60% :alt: LAN setup menu item #. Select ``Download Root CA``. Clicking this will prompt you to “Save to device”. - .. figure:: /_static/images/embassy_lan_setup0.svg + .. figure:: /_static/images/ssl/embassy_lan_setup0.svg :width: 60% :alt: LAN setup page @@ -29,7 +29,7 @@ iOS .. note:: If you have changed the default browser from Safari to Brave, the following auto save certificate to device flow will *not* work. Safari, Firefox, and Chrome work as expected. We recommend you temporarily use one of these browsers to complete this action. - .. figure:: /_static/images/ssl/mobile/ssl_certificate_install_page.svg + .. figure:: /_static/images/ssl/ios/ssl_certificate_install_page.svg :width: 40% :alt: Certificate install page @@ -37,17 +37,17 @@ iOS #. Go to Settings on your iOS device. - .. figure:: /_static/images/ssl/mobile/ssl_ipad_general_settings.svg + .. figure:: /_static/images/ssl/ios/ssl_ipad_general_settings.svg :width: 40% :alt: General settings #. Navigate to *General > Profile(s) > Downloaded Profile > Install*. - .. figure:: /_static/images/ssl/mobile/ssl_ipad_profiles.svg + .. figure:: /_static/images/ssl/ios/ssl_ipad_profiles.svg :width: 40% :alt: Profiles - .. figure:: /_static/images/ssl/mobile/ssl_ipad_install_profile.svg + .. figure:: /_static/images/ssl/ios/ssl_ipad_install_profile.svg :width: 40% :alt: Install profile @@ -57,7 +57,7 @@ iOS #. Next, navigate to *General > About > Certificate Trust Settings*. - .. figure:: /_static/images/ssl/mobile/ssl_ipad_cert_trust_settings.svg + .. figure:: /_static/images/ssl/ios/ssl_ipad_cert_trust_settings.svg :width: 40% :alt: Certificate trust settings @@ -65,7 +65,7 @@ iOS #. Enable full trust for root certificates. - .. figure:: /_static/images/ssl/mobile/ssl_ipad_cert_trust.svg + .. figure:: /_static/images/ssl/ios/ssl_ipad_cert_trust.svg :width: 40% :alt: Enable full trust diff --git a/site/source/support/user-manual/configuration/lan-setup/lan-os/lan-mac.rst b/site/source/support/user-manual/configuration/lan-setup/lan-os/lan-mac.rst index bd15062..83f7986 100644 --- a/site/source/support/user-manual/configuration/lan-setup/lan-os/lan-mac.rst +++ b/site/source/support/user-manual/configuration/lan-setup/lan-os/lan-mac.rst @@ -6,19 +6,19 @@ Mac #. Visit your Embassy at its Tor Address (for security purposes), and navigate to the :ref:`Embassy tab` -> LAN - .. figure:: /_static/images/ssl/macos/embassy_lan_setup.svg + .. figure:: /_static/images/ssl/embassy_lan_setup.svg :width: 60% :alt: LAN setup menu item #. Click "Download Root CA". This will prompt a download to save the certificate file to your machine. - .. figure:: /_static/images/ssl/macos/embassy_lan_setup0.svg + .. figure:: /_static/images/ssl/embassy_lan_setup0.svg :width: 60% :alt: LAN setup page #. Select the option to ``Open with`` "Keychain Access" and select ``OK``. If you choose to save the file, double click on it once downloaded. - .. figure:: /_static/images/ssl/macos/embassy_lan_setup1.svg + .. figure:: /_static/images/ssl/embassy_lan_setup1.svg :width: 60% :alt: LAN setup prompt