Merge pull request #7230 from freedomofpress/release/2.10.0

Backport 2.10.0 changes

Makefile

@@ -239,19 +239,7 @@ rust-audit:
 
 securedrop/config.py: ## Generate the test SecureDrop application config.
 	@echo "███ Generating securedrop/config.py..."
-	@cd securedrop && source_secret_key=$(shell head -c 32 /dev/urandom | base64) \
-	journalist_secret_key=$(shell head -c 32 /dev/urandom | base64) \
-	scrypt_id_pepper=$(shell head -c 32 /dev/urandom | base64) \
-	scrypt_gpg_pepper=$(shell head -c 32 /dev/urandom | base64) \
-	python -c 'import os; from jinja2 import Environment, FileSystemLoader; \
-		 env = Environment(loader=FileSystemLoader(".")); \
-		 ctx = {"securedrop_app_gpg_fingerprint": "65A1B5FF195B56353CC63DFFCC40EF1228271441"}; \
-		 ctx.update(dict((k, {"stdout":v}) for k,v in os.environ.items())); \
-		 ctx = open("config.py", "w").write(env.get_template("config.py.example").render(ctx))'
-	@echo >> securedrop/config.py
-	@echo "SUPPORTED_LOCALES = $$(make --quiet supported-locales)" >> securedrop/config.py
-	@echo "SUPPORTED_LOCALES.append('en_US')" >> securedrop/config.py
-	@echo
+	@./securedrop/bin/dev-config
 
 HOOKS_DIR=.githooks
 

changelog.md

@@ -1,7 +1,36 @@
 # Changelog
 
-## 2.10.0~rc1
+## 2.10.0
 
+This release contains fixes for issues described in the most recent security audit by 7A Security, see
+our [blog post](https://securedrop.org/news/securedrop-2_10_0-released/) for more details. It also contains other maintenance fixes.
+
+### Security
+
+* Don't allow admins to look up arbitrary users' TOTP secrets via the web (SEC-01-001 WP4)
+* Validate user provided same password back to server (SEC-01-002 WP4)
+* Require POST requests for `/logout` for CSRF protection (SEC-01-003 WP4)
+* Set password for redis access (SEC-01-008 WP3)
+* Set `SameSite=Strict` on all cookies for more CSRF protection
+
+### Web applications
+* Dependency updates:
+  * sequoia-openpgp (Rust crate) from 1.20.0 to 1.21.1 (#7197)
+  * setuptools from 56.0.0 to 70.3.0 for CVE-2024-6345 (#7205, #7214)
+  * openssl (Rust crate) from 0.10.60 to 0.10.66 for RUSTSEC-2024-0357 (#7206)
+
+### Journalist Workstation
+* Dependency updates:
+  * setuptools from 56.0.0 to 70.3.0 for CVE-2024-6345 (#7205, #7214)
+  * Remove d2to1 and pbr (#7205)
+
+### Development
+* Don't point people to the decommissioned SecureDrop forum (#7204)
+* Migrate all CI jobs to GitHub Actions (#7216, #7217, #7218, #7219, #7220, #7222, #7223)
+* Improve staging job by using upstream gcloud-sdk image and enforcing GCE VM lifespan (#7215, #7224)
+* Dependency updates:
+  * certifi from 2023.7.22 to 2024.7.4 for CVE-2024-39689 (#7199)
+  * Remove pytest-catchlog (#7199)
 
 ## 2.9.0
 

install_files/ansible-base/group_vars/all/securedrop

@@ -2,7 +2,7 @@
 # Variables that apply to both the app and monitor server go in this file
 # If the monitor or app server need different values define the variable in
 # hosts_vars/app.yml or host_vars/mon.yml
-securedrop_version: "2.10.0~rc1"
+securedrop_version: "2.10.0"
 securedrop_app_code_sdist_name: "securedrop-app-code-{{ securedrop_version | replace('~', '-') }}.tar.gz"
 
 grsecurity: true

install_files/ansible-base/roles/app/tasks/initialize_securedrop_app.yml

@@ -126,6 +126,48 @@
   tags:
     - securedrop_config
 
+- name: Generate 32-byte value for "redis password".
+  shell: "head -c 32 /dev/urandom | base64"
+  register: redis_password
+  when: not config.stat.exists
+  tags:
+    - securedrop_config
+
+- name: Add 32-byte value for "redis password" to config.py.
+  lineinfile:
+    dest: "{{ securedrop_code }}/config.py"
+    regexp: "redis_password"
+    line: "REDIS_PASSWORD = '{{ redis_password.stdout }}'"
+  when: not config.stat.exists
+  tags:
+    - securedrop_config
+
+- name: Create rq_config.py with the redis password
+  copy:
+    content: "REDIS_PASSWORD = \"{{ redis_password.stdout }}\""
+    dest: "{{ securedrop_code }}/rq_config.py"
+    owner: "root"
+    group: "www-data"
+    mode: "0640"
+  when: not config.stat.exists
+  tags:
+    - securedrop_config
+
+- name: Add 32-byte value for "redis password" to /etc/redis/redis.conf.
+  lineinfile:
+    dest: "/etc/redis/redis.conf"
+    regexp: "^requirepass"
+    line: "requirepass {{ redis_password.stdout }}"
+    insertafter: EOF
+  when: not config.stat.exists
+  register: redis_conf
+
+- name: Restart redis
+  service:
+    name: redis-server
+    state: restarted
+  when: redis_conf.changed
+
 - name: Declare Application GPG fingerprint in config.py.
   lineinfile:
     dest: "{{ securedrop_code }}/config.py"

molecule/shared/stable.ver

@@ -1 +1 @@
-2.9.0
+2.10.0

molecule/testinfra/app-code/test_securedrop_rqworker.py

@@ -23,7 +23,7 @@ def test_securedrop_rqworker_service(host):
                 securedrop_test_vars.securedrop_code,
                 securedrop_test_vars.securedrop_venv_site_packages,
             ),
-            f"ExecStart={securedrop_test_vars.securedrop_venv_bin}/rqworker",
+            f"ExecStart={securedrop_test_vars.securedrop_venv_bin}/rqworker -c rq_config",
             "PrivateDevices=yes",
             "PrivateTmp=yes",
             "ProtectSystem=full",

molecule/testinfra/app/test_redis.py

@@ -0,0 +1,38 @@
+"""
+Test redis is configured as desired
+"""
+
+import re
+
+import testutils
+
+sdvars = testutils.securedrop_test_vars
+testinfra_hosts = [sdvars.app_hostname]
+
+
+def test_auth_required(host):
+    """
+    Verify the redis server requires authentication
+    """
+    response = host.run("bash -c 'echo \"PING\" | redis-cli'").stdout.strip()
+    assert response == "NOAUTH Authentication required."
+
+
+def test_password_works(host):
+    """
+    Verify the redis password works
+    """
+    f = host.file("/var/www/securedrop/rq_config.py")
+    with host.sudo():
+        # First let's check file permissions
+        assert f.is_file
+        assert f.user == "root"
+        assert f.group == "www-data"
+        assert f.mode == 0o640
+        contents = f.content_string
+    password = re.search('"(.*?)"', contents).group(1)
+    # Now run an authenticated PING
+    response = host.run(
+        f'bash -c \'echo "PING" | REDISCLI_AUTH="{password}" redis-cli\''
+    ).stdout.strip()
+    assert response == "PONG"

securedrop/.gitignore

@@ -1,5 +1,6 @@
 # Don't version control config.py because it contains secret values
 config.py
+rq_config.py
 
 # compiled file
 securedrop-adminc

securedrop/bin/dev-config

@@ -0,0 +1,34 @@
+#!/usr/bin/env python3
+import os
+import base64
+import subprocess
+
+from jinja2 import Environment, FileSystemLoader
+
+
+def generate_random(length):
+    # Emulate the {"stdout": "..."} dictionaries Ansible produces when configuring non-development environments.
+    return {'stdout': base64.b64encode(os.urandom(length)).decode()}
+
+
+env = Environment(loader=FileSystemLoader("."))
+
+ctx = {
+    "securedrop_app_gpg_fingerprint": "65A1B5FF195B56353CC63DFFCC40EF1228271441",
+    'source_secret_key': generate_random(32),
+    'journalist_secret_key': generate_random(32),
+    'scrypt_id_pepper': generate_random(32),
+    'scrypt_gpg_pepper': generate_random(32),
+    'redis_password': generate_random(32),
+}
+
+with open('securedrop/config.py', 'w') as f:
+    text = env.get_template("securedrop/config.py.example").render(ctx)
+    text += '\n'
+    supported_locales = subprocess.check_output(['make', '--quiet', 'supported-locales']).decode().strip()
+    text += f'SUPPORTED_LOCALES = {supported_locales}\n'
+    text += 'SUPPORTED_LOCALES.append("en_US")\n'
+    f.write(text)
+
+with open('securedrop/rq_config.py', 'w') as f:
+    f.write('REDIS_PASSWORD = "{}"\n'.format(ctx['redis_password']['stdout']))

securedrop/bin/dev-deps

@@ -22,7 +22,11 @@ function run_xvfb() {
 
 function run_redis() {
     rm -f "${REPOROOT}/securedrop/dump.rdb"
-    setsid redis-server >& /tmp/redis.out || cat /tmp/redis.out
+    redis_password=$(cd "${REPOROOT}/securedrop" && python -c "import rq_config; print(rq_config.REDIS_PASSWORD)")
+    echo "$redis_password" > /tmp/redispasswd
+    echo "requirepass ${redis_password}" | sudo -u redis tee -a /etc/redis/redis.conf
+    echo "Starting redis..."
+    sudo service redis-server start
 }
 
 function setup_vncauth {
@@ -47,6 +51,7 @@ function append_to_exit() {
 function maybe_create_config_py() {
     if ! test -f "${REPOROOT}/securedrop/config.py" ; then
         append_to_exit "rm ${REPOROOT}/securedrop/config.py"
+        append_to_exit "rm ${REPOROOT}/securedrop/rq_config.py"
         (cd "$REPOROOT" && make test-config)
     fi
 }

securedrop/bin/generate-docs-screenshots

@@ -7,11 +7,11 @@ source "${BASH_SOURCE%/*}/dev-deps"
 
 run_xvfb &
 run_tor &
-run_redis &
 run_x11vnc &
 urandom
 build_redwood
 maybe_create_config_py
+run_redis
 
 pybabel compile --directory translations/
 pytest -v --page-layout "${@:-tests/functional/pageslayout}"

securedrop/bin/run

@@ -12,15 +12,15 @@ cd "${REPOROOT}/securedrop"
 source /opt/venvs/securedrop-app-code/bin/activate
 source "${BASH_SOURCE%/*}/dev-deps"
 
-run_redis &
 urandom
 build_redwood
 maybe_create_config_py
+run_redis
 reset_demo
 maybe_use_tor
 
 # run the batch processing services normally managed by systemd
-/opt/venvs/securedrop-app-code/bin/rqworker &
+PYTHONPATH="${REPOROOT}/securedrop" /opt/venvs/securedrop-app-code/bin/rqworker -c rq_config &
 PYTHONPATH="${REPOROOT}/securedrop" /opt/venvs/securedrop-app-code/bin/python "${REPOROOT}/securedrop/scripts/rqrequeue" --interval 60 &
 PYTHONPATH="${REPOROOT}/securedrop" /opt/venvs/securedrop-app-code/bin/python "${REPOROOT}/securedrop/scripts/shredder" --interval 60 &
 PYTHONPATH="${REPOROOT}/securedrop" /opt/venvs/securedrop-app-code/bin/python "${REPOROOT}/securedrop/scripts/source_deleter" --interval 10 &

securedrop/bin/run-test

@@ -20,12 +20,12 @@ source "${BASH_SOURCE%/*}/dev-deps"
 
 run_xvfb
 run_tor &
-run_redis &
 setup_vncauth
 run_x11vnc &
 urandom
 build_redwood
 maybe_create_config_py
+run_redis
 
 if [ -n "${CIRCLE_BRANCH:-}" ] ; then
     touch tests/log/firefox.log

securedrop/bin/translation-test

@@ -7,12 +7,12 @@ source "${BASH_SOURCE%/*}/dev-deps"
 
 run_xvfb
 run_tor &
-run_redis &
 setup_vncauth
 run_x11vnc &
 urandom
 build_redwood
 maybe_create_config_py
+run_redis
 pybabel compile --directory translations/
 
 mkdir -p "/tmp/test-results/logs"

securedrop/config.py.example

@@ -86,3 +86,5 @@ DEFAULT_LOCALE = 'en_US'
 
 # How long a session is valid before it expires and logs a user out
 SESSION_EXPIRATION_MINUTES = 120
+
+REDIS_PASSWORD = '{{ redis_password.stdout }}'

securedrop/debian/app-code/etc/apparmor.d/usr.sbin.apache2

@@ -185,11 +185,13 @@
   /var/www/securedrop/journalist_templates/_sources_confirmation_final_modal.html r,
   /var/www/securedrop/journalist_templates/_sources_confirmation_modal.html r,
   /var/www/securedrop/journalist_templates/account_edit_hotp_secret.html r,
-  /var/www/securedrop/journalist_templates/account_new_two_factor.html r,
+  /var/www/securedrop/journalist_templates/account_new_two_factor_totp.html r,
+  /var/www/securedrop/journalist_templates/account_new_two_factor_hotp.html r,
   /var/www/securedrop/journalist_templates/admin.html r,
   /var/www/securedrop/journalist_templates/admin_add_user.html r,
   /var/www/securedrop/journalist_templates/admin_edit_hotp_secret.html r,
-  /var/www/securedrop/journalist_templates/admin_new_user_two_factor.html r,
+  /var/www/securedrop/journalist_templates/admin_new_user_two_factor_totp.html r,
+  /var/www/securedrop/journalist_templates/admin_new_user_two_factor_hotp.html r,
   /var/www/securedrop/journalist_templates/base.html r,
   /var/www/securedrop/journalist_templates/col.html r,
   /var/www/securedrop/journalist_templates/config.html r,
@@ -213,6 +215,7 @@
   /var/www/securedrop/pretty_bad_protocol/_meta.py r,
   /var/www/securedrop/request_that_secures_file_uploads.py r,
   /var/www/securedrop/rm.py r,
+  /var/www/securedrop/rq_config.py r,
   /var/www/securedrop/sdconfig.py r,
   /var/www/securedrop/secure_tempfile.py r,
   /var/www/securedrop/source.py r,

securedrop/debian/app-code/lib/systemd/system/securedrop_rqworker.service

@@ -5,7 +5,7 @@ Wants=redis-server.service
 
 [Service]
 Environment=PYTHONPATH="/var/www/securedrop:/opt/venvs/securedrop-app-code/lib/python3.8/site-packages"
-ExecStart=/opt/venvs/securedrop-app-code/bin/rqworker
+ExecStart=/opt/venvs/securedrop-app-code/bin/rqworker -c rq_config
 PrivateDevices=yes
 PrivateTmp=yes
 ProtectSystem=full

securedrop/debian/changelog

@@ -1,8 +1,14 @@
+securedrop (2.10.0+focal) focal; urgency=medium
+
+  * see changelog.md
+
+ -- SecureDrop Team <securedrop@freedom.press>  Tue, 17 Sep 2024 16:05:58 -0400
+
 securedrop (2.10.0~rc1+focal) focal; urgency=medium
 
   * see changelog.md
 
- -- SecureDrop Team <securedrop@freedom.press>  Fri, 28 Jun 2024 11:37:37 -0400
+ -- SecureDrop Team <securedrop@freedom.press>  Thu, 29 Aug 2024 14:42:38 -0700
 
 securedrop (2.9.0+focal) focal; urgency=medium
 

securedrop/debian/securedrop-app-code.postinst

@@ -192,6 +192,22 @@ export_journalist_public_key() {
 
 }
 
+# Password-protect access to Redis
+set_redis_password() {
+    # Only run when upgrading, which means config.py exists and rq_config.py does not.
+    if ! test -f "/var/www/securedrop/rq_config.py" && test -f "/var/www/securedrop/config.py"; then
+        password=$(head -c 32 /dev/urandom | base64)
+        echo "requirepass $password" | sudo -u redis tee -a /etc/redis/redis.conf
+        # Set in config.py for web apps
+        echo "REDIS_PASSWORD = \"$password\"" >> /var/www/securedrop/config.py
+        # Create separate rq_config for rqworker
+        touch /var/www/securedrop/rq_config.py
+        chown root:www-data /var/www/securedrop/rq_config.py
+        chmod 640 /var/www/securedrop/rq_config.py
+        echo "REDIS_PASSWORD = \"$password\"" > /var/www/securedrop/rq_config.py
+        service redis-server restart
+    fi
+}
 
 case "$1" in
     configure)
@@ -235,12 +251,16 @@ case "$1" in
     chown -R root:root /var/www/securedrop
     chmod 755 /var/www/securedrop
 
-    # Make sure config.py is owned by root and readable by www-data,
+    # Make sure config.py and rq_config.py are owned by root and readable by www-data,
     # but not world-readable
     if [ -f "/var/www/securedrop/config.py" ]; then
         chown root:www-data /var/www/securedrop/config.py
         chmod 640 /var/www/securedrop/config.py
     fi
+    if [ -f "/var/www/securedrop/rq_config.py" ]; then
+        chown root:www-data /var/www/securedrop/rq_config.py
+        chmod 640 /var/www/securedrop/rq_config.py
+    fi
     # And logo needs to be writable by webserver user
     # If there's no custom logo yet, copy the default in its place
     if [ ! -f "/var/www/securedrop/static/i/custom_logo.png" ]; then
@@ -291,6 +311,9 @@ case "$1" in
     # GPG -> Sequoia migration
     export_journalist_public_key
 
+    # Set redis password
+    set_redis_password
+
     # Version migrations
     database_migration