Skip to content

Commit

Permalink
Update Admin USB rebuild instructions for v3 + 20.04 instances
Browse files Browse the repository at this point in the history
  • Loading branch information
@rocodes
rocodes committed May 18, 2021
1 parent dc1e198 commit bd2f252
Showing 1 changed file with 75 additions and 79 deletions.
154 changes: 75 additions & 79 deletions docs/rebuild_admin.rst
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,6 @@
Rebuilding an *Admin Workstation* USB
-------------------------------------

.. note:: These instructions refer to a SecureDrop instance using v2 onion
services. If your instance uses v3 onion services and you need to
rebuild your *Admin Workstation*, please contact FPF through the
`SecureDrop Support Portal`_.

.. _SecureDrop Support Portal: https://support-docs.securedrop.org/


In cases where an *Admin Workstation* USB stick has been lost or destroyed, and no
backup exists, it is possible to rebuild one. In order to do so, you'll need

Expand All @@ -20,16 +12,18 @@ backup exists, it is possible to rebuild one. In order to do so, you'll need

The process requires experience with the Linux command line and Tails, and
can take up to 3 hours. If a backup of the SecureDrop application server is available,
reinstalling the instance may be simpler. An outline of the steps involved in
rebuilding an *Admin Workstation* is as follows:
:doc:`reinstalling the instance and restoring the backup <backup_and_restore>`
may be simpler. An outline of the steps involved in rebuilding an
*Admin Workstation* is as follows:

#. Prepare the USB sticks.
#. (Optional) Boot the *Application* and *Monitor Server* in single user mode and reset
#. (Optional) Boot the *Application* and *Monitor Server* in single user mode and reset
the shell admin account password.
#. Set up SSH access for the new *Admin Workstation*.
#. Retrieve SecureDrop configuration settings from the *Application* and *Monitor Server*.
#. Retrieve SecureDrop configuration settings from the *Application* and *Monitor Server*.
#. Back up and configure the SecureDrop application.
#. Run the ``./securedrop-admin tailsconfig`` and ``./securedrop-admin install``
#. (Recommended) Re-enable SSH-over-Tor.
#. Run the ``./securedrop-admin install`` and ``./securedrop-admin tailsconfig``
commands from the new *Admin Workstation*.
#. Complete post-rebuild tasks.

Expand Down Expand Up @@ -127,7 +121,7 @@ chosen, you can check as follows:
#. Log in to the *Application Server* via the console using the adminstration username
and password.
#. Check to see if an SSH hidden proxy service exists, using the command
``sudo cat /var/lib/tor/services/ssh/hostname``. If this file exists and
``sudo cat /var/lib/tor/services/sshv3/hostname``. If this file exists and
includes an Onion URL and authorization token, your instance is set up
to use SSH over Tor and you should configure temporary SSH access
using :ref:`these instructions <rebuild_ssh_over_tor>`.
Expand Down Expand Up @@ -172,7 +166,7 @@ and deleting the line:
Then, restart ``sshd`` using the command ``sudo service sshd restart``.

Finally, check the file ``/etc/network/interfaces``, and note down the network
Finally, check the file ``/etc/netplan/10-ifupdown.yaml``, and note down the network
settings for the default Ethernet interface. You'll need them in the next step.

Repeat the process above for the *Monitor Server*, making sure to note down its
Expand All @@ -195,7 +189,7 @@ First, log on to the *Application Server* via the console and edit the file
Then, restart ``sshd`` using the command ``sudo service sshd restart``.

Finally, check the file ``/etc/network/interfaces``, and note down the network
Finally, check the file ``/etc/netplan/10-ifupdown.yaml``, and note down the network
settings for the default Ethernet interface. You'll need them in the next step.

Repeat the process above for the *Monitor Server*, making sure to note down its
Expand Down Expand Up @@ -242,85 +236,78 @@ In addition to the account and networking information retrieved from the servers
so far, you'll need to retrieve the following files and info:

- Tor Onion Service URLs and tokens
- GPG *Submission Public Key* and OSSEC public key
- GPG *Submission Public Key*, OSSEC Alerts public key, and (optional)
Journalist Alerts public key
- OSSEC alert configuration details
- (Optional) HTTPS configuration details

Retrieve Onion Service info
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Retrieve Onion Service Info
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In order to connect to the onion services used by your instance, you will
need to copy their details to the *Admin Workstation*. To do so, run the following
commands from a Terminal window:

.. code:: sh
cd ~/Persistent/securedrop/install_files/ansible-base
echo "HidServAuth $(ssh app sudo cat /var/lib/tor/services/journalist/hostname)" \
> app-journalist-aths
echo "$(ssh app sudo cat /var/lib/tor/services/source/hostname)" > app-source-ths
If your instance was set up to use SSH over TOR, you'll also need to copy over the details
of the SSH proxy onion services, by running the following commands:

.. code:: sh
echo "HidServAuth $(ssh app sudo cat /var/lib/tor/services/ssh/hostname)" > app-ssh-aths
echo "HidServAuth $(ssh mon sudo cat /var/lib/tor/services/ssh/hostname)" > mon-ssh-aths
echo "$(ssh app sudo cat /var/lib/tor/services/journalistv3/hostname)" \
> app-journalistv3-ths
echo "$(ssh app sudo cat /var/lib/tor/services/sourcev3/hostname)" > app-sourcev3-ths
Retrieve GPG Public Keys
~~~~~~~~~~~~~~~~~~~~~~~~
There are 2 GPG public keys required by the instance configuration, that you will need to
copy to the new *Admin Workstation*.

To copy the *Submission Public Key*, download it from the *Source Interface* and import
it locally using the following commands:
Copy the *Submission Public Key* with the following commands:

.. code:: sh
cd ~/Persistent/securedrop/install_files/ansible-base
curl http://$(cat app-source-ths)/public-key > SecureDrop.asc
curl http://$(cat app-sourcev3-ths)/public-key > SecureDrop.asc
gpg --import SecureDrop.asc
Validate that the imported key's fingerprint matches the one on your
SecureDrop install. You can do this by first running the command:
SecureDrop install. You can do this by running the command:

.. code:: sh
gpg --with-fingerprint --import-options import-show --dry-run --import SecureDrop.asc
gpg --with-fingerprint --import-options import-show --dry-run --import SecureDrop.asc
Then, compare the returned fingerprint value with that advertised by your *Source Interface*,
using the command:

.. code:: sh
curl http://$(cat app-source-ths)/metadata
curl http://$(cat app-sourcev3-ths)/metadata
To copy the *OSSEC Alert Public Key*, first list available keys on the monitor server:
Next, note the OSSEC Alerts email address (``OSSEC_EMAIL``) and, if applicable,
the Journalist Alerts email address (``JOURNALIST_EMAIL``):

.. code:: sh
ssh mon sudo gpg --homedir=/var/ossec/.gnupg -k
ssh mon sudo cat /var/ossec/send_encrypted_alarm.sh | grep _EMAIL= | cut -f7 -d' '
Look for the key corresponding to the destination email address for OSSEC alerts.
Then, import it locally using the following commands (substituting the
Import the *OSSEC Alert Public Key* using the following
commands (substituting the
appropriate email address for ``[email protected]``):

.. code:: sh
ssh mon sudo gpg --homedir=/var/ossec/.gnupg --export --armor [email protected] > ossec.pub
gpg --import ossec.pub
gpg --import ossec.pub
If a Journalist Alerts address has been configured, repeat this step for the
*Journalist Alert Public Key*, naming it ``journalist.pub`` or similar.

You will be prompted for the fingerprints for both keys during the next step. To view their fingerprints, use the command:
You will require the fingerprints for these keys during the next step, which you
can obtain via the command:

.. code:: sh
gpg -k --fingerprint
Retrieve OSSEC alert configuration details
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In addition to the OSSEC alert GPG key you retrieved above, you'll also need
the following configuration information:
You'll also need to retrieve the following configuration information:

- SMTP server
- SMTP port
Expand Down Expand Up @@ -363,8 +350,8 @@ certificate key, and chain file. When prompted for the names of these files
during the next step, you should specify them relative to the
``install_files/ansible-base`` directory, i.e. as ``ssl/mydomain.crt``.

Step 5: Configure and back up the application
=============================================
Step 5: Configure and back up the Application Server
====================================================

Next, configure the application using the files and info retrieved in the
previous steps. To do so, connect to the Tor network on the
Expand All @@ -379,54 +366,65 @@ previous steps. To do so, connect to the Tor network on the
.. note:: The ``./securedrop-admin setup`` command may take several minutes to complete, and may
fail due to network issues. If it fails, it's safe to run again.

When prompted, fill in the values retrieved in the previous steps.
The ``sdconfig`` command will prompt you to fill in configuration details
about your instance. Use the information retrieved in the previous steps.
When prompted whether or not to enable SSH-over-Tor, type **no** to ensure
that SSH-over-LAN remains enabled.

Once complete, configure the *Admin Workstation* using the command:
Next, back up the Application server by running the following command in the terminal:

.. code:: sh
./securedrop-admin tailsconfig
./securedrop-admin backup
This will set up desktop shortcuts for the *Source* and *Journalist Interfaces*,
and configure adminstrative access to the servers.
Ensure the backup command completes successfully.

Once the ``./securedrop-admin tailsconfig`` command is complete:
- verify that the ``Hostname`` references in ``~/.ssh/config`` have been updated
to refer to Onion URLs instead of direct IP addresses,
- verify that you can connect to
the servers using ``ssh app`` and ``ssh mon``, accepting the host verification
prompt if necessary,
- and verify that the desktop shortcuts for the *Source* and *Journalist Interfaces*
work correctly, opening their respective homepages in Tor Browser.
Step 6 (Recommended): Re-enable SSH-over-Tor
============================================

Next, back up the servers by running the following command in the terminal:
We recommend enabling SSH over Tor and disabling SSH-over-LAN.
To do so, run:

.. code:: sh
./securedrop-admin backup
./securedrop-admin sdconfig
Press "Enter" to accept the prepopulated values until you reach the
SSH-over-Tor settings, this time typing **yes** to enable SSH-over-Tor.

Step 6: Run the ``./securedrop-admin install`` command
======================================================
Step 7: Use the installer to fetch the server configuration
===========================================================

After the ``./securedrop-admin backup`` command completes successfully, you should
undo the changes made to enable temporary local SSH access, by running the following
command:
Run:

.. code:: sh
./securedrop-admin install
./securedrop-admin install
Once the command completes successfully, run

.. code:: sh
./securedrop-admin tailsconfig
Once this command is complete:

- verify that the Hostname references in ``~/.ssh/config`` have been updated
to refer to Onion URLs instead of direct IP addresses
- verify that you can connect to
the servers using ``ssh app`` and ``ssh mon``
- verify that the desktop shortcuts for the *Source* and *Journalist Interfaces*
work correctly, opening their respective homepages in Tor Browser.

Once the command completes successfully, your new *Admin Workstation* is ready
for use. To revert the changes made to enable temporary local SSH access, you
To revert the changes made to enable temporary local SSH access, you
should reboot the servers, by issuing the following commands in a terminal:

.. code:: sh
ssh app sudo reboot
ssh mon sudo reboot
Step 7: Post-rebuild tasks
Step 8: Post-rebuild tasks
==========================

We recommend completing the following tasks after the rebuild:
Expand All @@ -436,12 +434,12 @@ We recommend completing the following tasks after the rebuild:
- Verify that submissions can be decrypted, by going through the decryption
workflow with a new submission.
- Back up your *Admin Workstation* using the process
:ref:`documented here <backup_workstations>`.
:ref:`documented here <backup_workstations>`.
- Delete invalid admin accounts in the *Journalist Interface*.
- Restrict SSH access to the *Application* and *Monitor Servers* to valid
*Admin Workstions*. If your new *Admin Workstation* USB stick
is the only one that should have SSH access to the servers, you can remove
access for any previous *Admin Workstations* from the terminal, using the
access for any previous *Admin Workstations* from the terminal, using the
commands:

.. code:: sh
Expand All @@ -452,7 +450,5 @@ We recommend completing the following tasks after the rebuild:
You can also selectively remove invalid keys by logging on to the *Application*
and *Monitor Servers* and editing the file ``~/.ssh/authorized_keys``, making
sure not to remove the public key belonging to your new *Admin Workstation*.
- Optionally, set up :ref:`daily journalist alerts <daily_journalist_alerts>`,
by running ``./securedrop-admin sdconfig`` and providing a valid
GPG key and fingerprint, along with the corresponding destination email address, then
running ``./securedrop-admin install`` again to update the server configuration.
- :doc:`Back up the Application server <backup_and_restore>` once SSH-over-Tor has
been restored. Ensure that server and workstation backups happen regularly.

0 comments on commit bd2f252

Please sign in to comment.