Created
January 18, 2018 00:43
-
-
Save conorsch/0a928c232dba646e545e661c556ba33c to your computer and use it in GitHub Desktop.
Terminal session following up on https://github.com/freedomofpress/securedrop/pull/2888#issuecomment-358493614
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| [conor@October:~/freedomofpress/securedrop] [sd] 9aa70048d+* ± | |
| $ git fetch | |
| remote: Counting objects: 85, done. | |
| remote: Compressing objects: 100% (27/27), done. | |
| remote: Total 85 (delta 46), reused 74 (delta 46), pack-reused 9 | |
| Unpacking objects: 100% (85/85), done. | |
| From github.com:freedomofpress/securedrop | |
| + 50f2d2c9c...cd608b87c byebye-travis-ci -> origin/byebye-travis-ci (forced update) | |
| + 895649bd4...b7d991e7f experimental_signal_cli_notifications -> origin/experimental_signal_cli_notifications (forced update) | |
| * [new branch] use-xenial-gettext -> origin/use-xenial-gettext | |
| * [new branch] wip-dachary-master -> origin/wip-dachary-master | |
| [conor@October:~/freedomofpress/securedrop] [sd] 9aa70048d+* 2s ± | |
| $ git checkout master | |
| gPrevious HEAD position was 9aa70048d... SecureDrop 0.5.1 | |
| Switched to branch 'master' | |
| it[conor@October:~/freedomofpress/securedrop] [sd] master+* ± | |
| $ git checkout -b try-merging-0.5.1-into-master | |
| Switched to a new branch 'try-merging-0.5.1-into-master' | |
| [conor@October:~/freedomofpress/securedrop] [sd] try-merging-0.5.1-into-master+* ± | |
| $ git merge 0.5.1 | |
| Removing testinfra/vars/apptestclient.yml | |
| Removing testinfra/requirements.txt | |
| Auto-merging securedrop/tests/functional/test_submission_not_in_memory.py | |
| Auto-merging securedrop/sass/modules/_button.sass | |
| Auto-merging securedrop/sass/libraries/_normalize.sass | |
| Auto-merging securedrop/sass/libraries/_font-awesome-iconography.sass | |
| Removing securedrop/requirements/update_python_dependencies | |
| Removing securedrop/requirements/securedrop-requirements.txt | |
| Auto-merging securedrop/requirements/securedrop-app-code-requirements.in | |
| Auto-merging securedrop/requirements/admin-requirements.txt | |
| Auto-merging molecule/aws/tests/test_tor_interfaces.py | |
| Auto-merging molecule/aws/scripts/app-tests.sh | |
| Removing migration_scripts/0.3pre/upgrade.sh | |
| Removing migration_scripts/0.2.1/old_crypto_util.py | |
| Removing migration_scripts/0.2.1/nouns.txt | |
| Removing migration_scripts/0.2.1/adjectives.txt | |
| Removing migration_scripts/0.2.1/0.3_migrate.py | |
| Removing migration_scripts/0.2.1/0.2.1_collect.py | |
| Removing install_files/securedrop-ossec-server/var/ossec/setup_gmail_test.sh | |
| Auto-merging install_files/ansible-base/roles/tails-config/templates/desktop-journalist-icon.j2.in | |
| Removing install_files/ansible-base/roles/grsecurity/meta/main.yml | |
| Removing install_files/ansible-base/requirements.all | |
| Removing install_files/ansible-base/action_plugins/synchronize.py | |
| Auto-merging docs/threat_model/threat_model.rst | |
| Removing docs/images/yubikey_oath_hotp_configuration.png | |
| Removing docs/images/manual/viewing8.jpg | |
| Removing docs/images/manual/viewing7.jpg | |
| Removing docs/images/manual/viewing6.jpg | |
| Removing docs/images/manual/viewing5.jpg | |
| Removing docs/images/manual/viewing4.jpg | |
| Removing docs/images/manual/viewing3.jpg | |
| Removing docs/images/manual/viewing2.jpg | |
| Removing docs/images/manual/viewing1.jpg | |
| Removing docs/images/manual/source_upload_submission.png | |
| Removing docs/images/manual/source_submission_received.png | |
| Removing docs/images/manual/source_second_login.png | |
| Removing docs/images/manual/source_reply_from_journalist.png | |
| Removing docs/images/manual/source_reply_deleted.png | |
| Removing docs/images/manual/source_landing_with_warning.png | |
| Removing docs/images/manual/source_landing_page_no_warning.png | |
| Removing docs/images/manual/source_landing_page_disable_javascript.png | |
| Removing docs/images/manual/source_generate_codename.png | |
| Removing docs/images/manual/source_flagged_for_reply.png | |
| Removing docs/images/manual/source9.png | |
| Removing docs/images/manual/source8.png | |
| Removing docs/images/manual/source7.png | |
| Removing docs/images/manual/source6.png | |
| Removing docs/images/manual/source5.png | |
| Removing docs/images/manual/source4.png | |
| Removing docs/images/manual/source3.png | |
| Removing docs/images/manual/source2.png | |
| Removing docs/images/manual/source11.png | |
| Removing docs/images/manual/source10.png | |
| Removing docs/images/manual/source1.png | |
| Removing docs/images/manual/source-step9.png | |
| Removing docs/images/manual/source-step8.png | |
| Removing docs/images/manual/source-step6.png | |
| Removing docs/images/manual/source-step5.png | |
| Removing docs/images/manual/source-step4.png | |
| Removing docs/images/manual/source-step3-and-step7.png | |
| Removing docs/images/manual/source-step2.png | |
| Removing docs/images/manual/source-step11.png | |
| Removing docs/images/manual/source-step10.png | |
| Removing docs/images/manual/source-step1.png | |
| Removing docs/images/manual/logout-notification.png | |
| Removing docs/images/manual/journalist-admin_new_user_two_factor_totp.png | |
| Removing docs/images/manual/journalist-admin_new_user_two_factor_hotp.png | |
| Removing docs/images/manual/journalist-admin_add_user_totp.png | |
| Removing docs/images/manual/journalist-admin_add_user_hotp.png | |
| Removing docs/images/manual/document_flagged_for_reply_notification.png | |
| Removing docs/images/manual/document_flag_for_reply_button.png | |
| Removing docs/images/manual/document6.png | |
| Removing docs/images/manual/document4.png | |
| Removing docs/images/manual/document3.png | |
| Removing docs/images/manual/document2.png | |
| Removing docs/images/manual/document1.png | |
| Auto-merging docs/images/labels/secure_viewing_station_offline_warning.xcf | |
| Removing docs/images/labels/sd_mon_server.xcf | |
| Removing docs/images/labels/sd_journalist_workstation.xcf | |
| Removing docs/images/labels/sd_app_server.xcf | |
| Removing docs/images/labels/sd_admin_workstation.xcf | |
| Auto-merging docs/images/labels/firewall.xcf | |
| Removing docs/images/admin_secondary_home.png | |
| Removing docs/images/admin_main_home.png | |
| Removing docs/images/admin_enter_verification.png | |
| Removing docs/google_authenticator.rst | |
| Removing devops/vars/staging.yml | |
| Removing devops/templates/ssh_config | |
| Removing devops/scripts/spin-run-test.sh | |
| Removing devops/scripts/docs-detection | |
| Removing devops/scripts/ci-tester.sh | |
| Removing devops/scripts/ci-teardown.sh | |
| Removing devops/scripts/ci-spinup.sh | |
| Removing devops/scripts/ci-runner.sh | |
| Removing devops/scripts/ci-build_only.sh | |
| Removing devops/playbooks/ci-app-tests.yml | |
| Removing devops/playbooks/aws-ci-teardown.yml | |
| Removing devops/playbooks/aws-ci-startup.yml | |
| Removing devops/inventory/staging | |
| Removing devops/ansible_env | |
| Merge made by the 'recursive' strategy. | |
| .circleci/config.yml | 150 +- | |
| .github/CODEOWNERS | 10 + | |
| .gitignore | 3 + | |
| .mailmap | 20 + | |
| .travis.yml | 13 +- | |
| .yamllint | 6 + | |
| CONTRIBUTING.md | 10 + | |
| Makefile | 98 +- | |
| README.md | 20 +- | |
| Vagrantfile | 1 + | |
| changelog.md | 101 +- | |
| devops/ansible_env | 6 - | |
| devops/docker/Dockerfile.linting | 12 + | |
| devops/inventory/staging | 24 - | |
| devops/jenkins/TorNightlyPipeline | 61 + | |
| devops/playbooks/aws-ci-startup.yml | 165 - | |
| devops/playbooks/aws-ci-teardown.yml | 72 - | |
| devops/playbooks/ci-app-tests.yml | 23 - | |
| devops/scripts/aws-jenkins-venv.sh | 7 + | |
| devops/scripts/ci-build_only.sh | 9 - | |
| devops/scripts/ci-runner.sh | 18 - | |
| devops/scripts/ci-spinup.sh | 8 - | |
| devops/scripts/ci-teardown.sh | 13 - | |
| devops/scripts/ci-tester.sh | 47 - | |
| devops/scripts/docs-detection | 3 - | |
| devops/scripts/local-setup.sh | 3 +- | |
| devops/scripts/rebase-develop.sh | 21 + | |
| devops/scripts/spin-run-test.sh | 19 - | |
| devops/templates/ssh_config | 13 - | |
| devops/vars/staging.yml | 8 - | |
| docs/admin.rst | 247 +- | |
| docs/backup_workstations.rst | 10 +- | |
| docs/before_you_begin.rst | 11 +- | |
| docs/conf.py | 4 +- | |
| docs/configure_admin_workstation_post_install.rst | 4 +- | |
| docs/create_admin_account.rst | 9 +- | |
| docs/deployment/landing_page.rst | 328 + | |
| docs/deployment/minimum_security_requirements.rst | 19 + | |
| docs/deployment/sample_privacy_policy.rst | 97 + | |
| docs/deployment/whole_site_changes.rst | 33 + | |
| docs/deployment_practices.rst | 307 +- | |
| docs/development/contributor_guidelines.rst | 34 +- | |
| docs/development/documentation_guidelines.rst | 21 +- | |
| docs/development/getting_started.rst | 345 +- | |
| docs/development/i18n.rst | 276 +- | |
| docs/development/l10n.rst | 34 + | |
| docs/development/setup_development.rst | 163 + | |
| docs/development/testing_application_tests.rst | 9 +- | |
| docs/development/tips_and_tricks.rst | 4 +- | |
| docs/development/updating_ossec.rst | 6 +- | |
| docs/development/virtual_environments.rst | 99 +- | |
| docs/development/virtualizing_tails.rst | 306 + | |
| docs/diagrams/README.md | 4 +- | |
| docs/diagrams/SecureDrop_DataFlow.draw | 1 + | |
| docs/diagrams/SecureDrop_DataFlow.png | Bin 0 -> 128701 bytes | |
| docs/generate_securedrop_application_key.rst | 37 +- | |
| docs/getting_the_most_out_of_securedrop.rst | 21 +- | |
| docs/google_authenticator.rst | 48 - | |
| docs/hardware.rst | 139 +- | |
| docs/https_source_interface.rst | 31 +- | |
| docs/images/admin_enter_verification.png | Bin 87208 -> 0 bytes | |
| docs/images/admin_main_home.png | Bin 45401 -> 0 bytes | |
| docs/images/admin_secondary_home.png | Bin 53027 -> 0 bytes | |
| docs/images/devenv/tails-libvirt-boot-options.png | Bin 0 -> 55007 bytes | |
| docs/images/devenv/tails-libvirt-filesystem-config.png | Bin 0 -> 61175 bytes | |
| docs/images/install/exportkey2.png | Bin 42442 -> 45334 bytes | |
| docs/images/labels/admin_workstation.png | Bin 23100 -> 25786 bytes | |
| docs/images/labels/admin_workstation.xcf | Bin 0 -> 89673 bytes | |
| docs/images/labels/app_server.png | Bin 20795 -> 21084 bytes | |
| docs/images/labels/app_server.xcf | Bin 0 -> 91968 bytes | |
| docs/images/labels/firewall.png | Bin 12683 -> 12736 bytes | |
| docs/images/labels/{sd_firewall.xcf => firewall.xcf} | Bin 55019 -> 56354 bytes | |
| docs/images/labels/journalist_workstation.png | Bin 25731 -> 24979 bytes | |
| docs/images/labels/journalist_workstation.xcf | Bin 0 -> 110345 bytes | |
| docs/images/labels/mon_server.png | Bin 21587 -> 21923 bytes | |
| docs/images/labels/mon_server.xcf | Bin 0 -> 81992 bytes | |
| docs/images/labels/sd_admin_workstation.xcf | Bin 95497 -> 0 bytes | |
| docs/images/labels/sd_app_server.xcf | Bin 89410 -> 0 bytes | |
| docs/images/labels/sd_journalist_workstation.xcf | Bin 109832 -> 0 bytes | |
| docs/images/labels/sd_mon_server.xcf | Bin 79446 -> 0 bytes | |
| docs/images/labels/secure_viewing_station_offline_warning.png | Bin 97776 -> 100862 bytes | |
| ..._viewing_station_offline_warning.xcf => secure_viewing_station_offline_warning.xcf} | Bin 201324 -> 208519 bytes | |
| docs/images/labels/usb_admin.png | Bin 10782 -> 10203 bytes | |
| docs/images/labels/usb_admin.xcf | Bin 42540 -> 49532 bytes | |
| docs/images/labels/usb_file_transfer.png | Bin 7864 -> 8176 bytes | |
| docs/images/labels/usb_file_transfer.xcf | Bin 53705 -> 55885 bytes | |
| docs/images/labels/usb_journalist.png | Bin 14475 -> 14706 bytes | |
| docs/images/labels/usb_journalist.xcf | Bin 52213 -> 63438 bytes | |
| docs/images/labels/usb_svs.png | Bin 9711 -> 7938 bytes | |
| docs/images/labels/usb_svs.xcf | Bin 33497 -> 39861 bytes | |
| docs/images/manual/document1.png | Bin 66612 -> 0 bytes | |
| docs/images/manual/document2.png | Bin 57988 -> 0 bytes | |
| docs/images/manual/document3.png | Bin 88929 -> 0 bytes | |
| docs/images/manual/document4.png | Bin 81197 -> 0 bytes | |
| docs/images/manual/document6.png | Bin 51023 -> 0 bytes | |
| docs/images/manual/document_flag_for_reply_button.png | Bin 88121 -> 0 bytes | |
| docs/images/manual/document_flagged_for_reply_notification.png | Bin 93103 -> 0 bytes | |
| docs/images/manual/journalist-admin_add_user_hotp.png | Bin 34888 -> 0 bytes | |
| docs/images/manual/journalist-admin_add_user_totp.png | Bin 32465 -> 0 bytes | |
| docs/images/manual/journalist-admin_new_user_two_factor_hotp.png | Bin 30100 -> 0 bytes | |
| docs/images/manual/journalist-admin_new_user_two_factor_totp.png | Bin 79223 -> 0 bytes | |
| docs/images/manual/logout-notification.png | Bin 105016 -> 0 bytes | |
| docs/images/manual/restart-tor-browser.png | Bin 97023 -> 30725 bytes | |
| docs/images/manual/screenshots/journalist-admin_add_user_hotp.png | Bin 0 -> 37460 bytes | |
| docs/images/manual/screenshots/journalist-admin_add_user_totp.png | Bin 0 -> 34394 bytes | |
| docs/images/manual/screenshots/journalist-admin_changes_logo_image.png | Bin 0 -> 56170 bytes | |
| docs/images/manual/screenshots/journalist-admin_index_no_documents.png | Bin 0 -> 23511 bytes | |
| docs/images/manual/screenshots/journalist-admin_interface_index.png | Bin 0 -> 34537 bytes | |
| docs/images/manual/screenshots/journalist-admin_new_user_two_factor_hotp.png | Bin 0 -> 32273 bytes | |
| docs/images/manual/screenshots/journalist-admin_new_user_two_factor_totp.png | Bin 0 -> 79618 bytes | |
| docs/images/manual/screenshots/journalist-admin_ossec_alert_button.png | Bin 0 -> 57433 bytes | |
| docs/images/manual/screenshots/journalist-admin_system_config_page.png | Bin 0 -> 52739 bytes | |
| docs/images/manual/screenshots/journalist-clicks_on_source_and_selects_documents.png | Bin 0 -> 69612 bytes | |
| docs/images/manual/screenshots/journalist-col_flagged.png | Bin 0 -> 64843 bytes | |
| docs/images/manual/screenshots/journalist-col_has_no_key.png | Bin 0 -> 60646 bytes | |
| docs/images/manual/screenshots/journalist-composes_reply.png | Bin 0 -> 66911 bytes | |
| docs/images/manual/screenshots/journalist-index_javascript.png | Bin 0 -> 33597 bytes | |
| docs/images/manual/screenshots/journalist-index_with_text.png | Bin 0 -> 21955 bytes | |
| docs/images/manual/screenshots/source-checks_for_reply.png | Bin 0 -> 81393 bytes | |
| docs/images/manual/screenshots/source-deletes_reply.png | Bin 0 -> 60910 bytes | |
| docs/images/manual/screenshots/source-enter-codename-in-login.png | Bin 0 -> 22255 bytes | |
| docs/images/manual/screenshots/source-flagged.png | Bin 0 -> 89359 bytes | |
| docs/images/manual/screenshots/source-generate.png | Bin 0 -> 58562 bytes | |
| docs/images/manual/screenshots/source-index.png | Bin 0 -> 55230 bytes | |
| docs/images/manual/screenshots/source-logout_flashed_message.png | Bin 0 -> 70548 bytes | |
| docs/images/manual/screenshots/source-lookup.png | Bin 0 -> 73894 bytes | |
| docs/images/manual/screenshots/source-submission_entered_text.png | Bin 0 -> 65154 bytes | |
| docs/images/manual/securedrop-security-slider-warning.png | Bin 0 -> 7387 bytes | |
| docs/images/manual/source-step1.png | Bin 93965 -> 0 bytes | |
| docs/images/manual/source-step10.png | Bin 80079 -> 0 bytes | |
| docs/images/manual/source-step11.png | Bin 188876 -> 0 bytes | |
| docs/images/manual/source-step2.png | Bin 97595 -> 0 bytes | |
| docs/images/manual/source-step3-and-step7.png | Bin 88434 -> 0 bytes | |
| docs/images/manual/source-step4.png | Bin 84904 -> 0 bytes | |
| docs/images/manual/source-step5.png | Bin 82058 -> 0 bytes | |
| docs/images/manual/source-step6.png | Bin 86617 -> 0 bytes | |
| docs/images/manual/source-step8.png | Bin 52694 -> 0 bytes | |
| docs/images/manual/source-step9.png | Bin 67309 -> 0 bytes | |
| docs/images/manual/source-turn-slider-to-high.png | Bin 0 -> 38996 bytes | |
| docs/images/manual/source1.png | Bin 131547 -> 0 bytes | |
| docs/images/manual/source10.png | Bin 104265 -> 0 bytes | |
| docs/images/manual/source11.png | Bin 99426 -> 0 bytes | |
| docs/images/manual/source2.png | Bin 127042 -> 0 bytes | |
| docs/images/manual/source3.png | Bin 112846 -> 0 bytes | |
| docs/images/manual/source4.png | Bin 121840 -> 0 bytes | |
| docs/images/manual/source5.png | Bin 101544 -> 0 bytes | |
| docs/images/manual/source6.png | Bin 102828 -> 0 bytes | |
| docs/images/manual/source7.png | Bin 112705 -> 0 bytes | |
| docs/images/manual/source8.png | Bin 98213 -> 0 bytes | |
| docs/images/manual/source9.png | Bin 104923 -> 0 bytes | |
| docs/images/manual/source_flagged_for_reply.png | Bin 106658 -> 0 bytes | |
| docs/images/manual/source_generate_codename.png | Bin 179401 -> 0 bytes | |
| docs/images/manual/source_landing_page_disable_javascript.png | Bin 203046 -> 0 bytes | |
| docs/images/manual/source_landing_page_no_warning.png | Bin 169172 -> 0 bytes | |
| docs/images/manual/source_landing_with_warning.png | Bin 180298 -> 0 bytes | |
| docs/images/manual/source_reply_deleted.png | Bin 163053 -> 0 bytes | |
| docs/images/manual/source_reply_from_journalist.png | Bin 188767 -> 0 bytes | |
| docs/images/manual/source_second_login.png | Bin 131228 -> 0 bytes | |
| docs/images/manual/source_submission_received.png | Bin 174941 -> 0 bytes | |
| docs/images/manual/source_upload_submission.png | Bin 170362 -> 0 bytes | |
| docs/images/manual/tbb_Document5.png | Bin 115391 -> 49930 bytes | |
| docs/images/manual/tbb_Document6.png | Bin 102510 -> 73165 bytes | |
| docs/images/manual/viewing1.jpg | Bin 152635 -> 0 bytes | |
| docs/images/manual/viewing2.jpg | Bin 138448 -> 0 bytes | |
| docs/images/manual/viewing3.jpg | Bin 145467 -> 0 bytes | |
| docs/images/manual/viewing4.jpg | Bin 166267 -> 0 bytes | |
| docs/images/manual/viewing5.jpg | Bin 145301 -> 0 bytes | |
| docs/images/manual/viewing6.jpg | Bin 221058 -> 0 bytes | |
| docs/images/manual/viewing7.jpg | Bin 196460 -> 0 bytes | |
| docs/images/manual/viewing8.jpg | Bin 190107 -> 0 bytes | |
| docs/images/weblate/admin-lock.png | Bin 0 -> 175841 bytes | |
| docs/images/weblate/admin-locked.png | Bin 0 -> 105143 bytes | |
| docs/images/weblate/admin-unlock.png | Bin 0 -> 184180 bytes | |
| docs/images/weblate/admin-unlocked.png | Bin 0 -> 76400 bytes | |
| docs/images/yubikey_oath_hotp_configuration.png | Bin 249632 -> 0 bytes | |
| docs/images/yubikey_oath_htop_configuration.png | Bin 0 -> 95401 bytes | |
| docs/images/yubikey_overview.png | Bin 0 -> 50818 bytes | |
| docs/includes/docs-branches.txt | 10 + | |
| docs/includes/otp-app.txt | 7 + | |
| docs/includes/rerun-install-is-safe.txt | 5 + | |
| docs/index.rst | 26 +- | |
| docs/install.rst | 63 +- | |
| docs/journalist.rst | 464 +- | |
| docs/network_firewall.rst | 34 +- | |
| docs/onboarding.rst | 12 +- | |
| docs/ossec_alerts.rst | 23 +- | |
| docs/overview.rst | 22 +- | |
| docs/passphrase_best_practices.rst | 67 +- | |
| docs/passphrases.rst | 23 +- | |
| docs/servers.rst | 56 +- | |
| docs/servers_2fa.rst | 31 + | |
| docs/set_up_admin_tails.rst | 6 +- | |
| docs/set_up_svs.rst | 33 + | |
| docs/set_up_tails.rst | 2 +- | |
| docs/source.rst | 107 +- | |
| docs/tails_guide.rst | 50 +- | |
| docs/terminology.rst | 16 +- | |
| docs/test_the_installation.rst | 8 +- | |
| docs/threat_model/dataflow.rst | 10 + | |
| docs/{development => threat_model}/threat_model.rst | 21 +- | |
| docs/training_schedule.rst | 8 +- | |
| docs/upgrade/0.4.x_to_0.5.rst | 77 + | |
| docs/upgrade_to_tails_3x.rst | 8 +- | |
| docs/what_makes_securedrop_unique.rst | 4 +- | |
| docs/yubikey_setup.rst | 187 +- | |
| git/pre-commit | 2 + | |
| install_files/ansible-base/action_plugins/synchronize.py | 415 - | |
| install_files/ansible-base/build-deb-pkgs.yml | 37 +- | |
| install_files/ansible-base/group_vars/all/securedrop | 17 +- | |
| install_files/ansible-base/group_vars/securedrop_application_server.yml | 3 +- | |
| install_files/ansible-base/group_vars/securedrop_monitor_server.yml | 3 +- | |
| install_files/ansible-base/prod-specific.yml | 4 - | |
| install_files/ansible-base/requirements.all | 21 - | |
| install_files/ansible-base/roles/app-test/tasks/main.yml | 2 + | |
| install_files/ansible-base/roles/app-test/tasks/modern_gettext.yml | 28 + | |
| install_files/ansible-base/roles/app-test/tasks/setup_firefox_for_selenium.yml | 1 - | |
| install_files/ansible-base/roles/app/defaults/main.yml | 18 +- | |
| install_files/ansible-base/roles/app/tasks/initialize_securedrop_app.yml | 28 +- | |
| install_files/ansible-base/roles/app/templates/sites-available/journalist.conf | 1 + | |
| install_files/ansible-base/roles/app/templates/sites-available/source.conf | 8 + | |
| install_files/ansible-base/roles/build-generic-pkg/files/build_generic_package.sh | 18 +- | |
| install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/defaults/main.yml | 2 +- | |
| .../ansible-base/roles/build-securedrop-app-code-deb-pkg/files/usr.sbin.apache2 | 49 +- | |
| .../roles/build-securedrop-app-code-deb-pkg/tasks/build_securedrop_app_code_deb.yml | 4 +- | |
| install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/tasks/sass.yml | 4 +- | |
| .../ansible-base/roles/build-securedrop-app-code-deb-pkg/tasks/translations.yml | 23 + | |
| install_files/ansible-base/roles/ci-tweaks/tasks/main.yml | 17 + | |
| install_files/ansible-base/roles/common/tasks/main.yml | 2 + | |
| install_files/ansible-base/roles/common/tasks/post_ubuntu_install_checks.yml | 51 + | |
| install_files/ansible-base/roles/common/tasks/setup_etc_hosts.yml | 1 - | |
| install_files/ansible-base/roles/common/templates/security.list | 2 +- | |
| install_files/ansible-base/roles/development/defaults/main.yml | 2 +- | |
| install_files/ansible-base/roles/development/tasks/main.yml | 2 +- | |
| install_files/ansible-base/roles/grsecurity/meta/main.yml | 5 - | |
| install_files/ansible-base/roles/grsecurity/tasks/apply_grsec_lock.yml | 2 +- | |
| install_files/ansible-base/roles/install-local-packages/tasks/install_debs.yml | 6 +- | |
| install_files/ansible-base/roles/ossec-agent/handlers/main.yml | 1 - | |
| install_files/ansible-base/roles/ossec-agent/tasks/agent_config.yml | 1 - | |
| install_files/ansible-base/roles/ossec-server/tasks/mon_configure_custom_cert.yml | 1 - | |
| install_files/ansible-base/roles/ossec-server/templates/send_encrypted_alarm.sh | 6 +- | |
| install_files/ansible-base/roles/restrict-direct-access/tasks/dh_moduli.yml | 38 +- | |
| install_files/ansible-base/roles/restrict-direct-access/tasks/fetch_tor_config.yml | 3 +- | |
| install_files/ansible-base/roles/restrict-direct-access/templates/sshd_config | 2 +- | |
| install_files/ansible-base/roles/tails-config/files/65-configure-tor-for-securedrop.sh | 4 +- | |
| install_files/ansible-base/roles/tails-config/files/securedrop_init.py | 28 +- | |
| install_files/ansible-base/roles/tails-config/tasks/configure_network_hook.yml | 1 - | |
| install_files/ansible-base/roles/tails-config/tasks/create_desktop_shortcuts.yml | 6 +- | |
| install_files/ansible-base/roles/tails-config/templates/ar.po | 28 + | |
| install_files/ansible-base/roles/tails-config/templates/de_DE.po | 27 + | |
| install_files/ansible-base/roles/tails-config/templates/desktop-journalist-icon.j2 | 19 + | |
| .../roles/tails-config/templates/{desktop-icon.j2 => desktop-journalist-icon.j2.in} | 4 +- | |
| install_files/ansible-base/roles/tails-config/templates/desktop-source-icon.j2 | 19 + | |
| install_files/ansible-base/roles/tails-config/templates/desktop-source-icon.j2.in | 10 + | |
| install_files/ansible-base/roles/tails-config/templates/desktop.pot | 25 + | |
| install_files/ansible-base/roles/tails-config/templates/es_ES.po | 27 + | |
| install_files/ansible-base/roles/tails-config/templates/fr.po | 28 + | |
| install_files/ansible-base/roles/tails-config/templates/it.po | 27 + | |
| install_files/ansible-base/roles/tails-config/templates/nb_NO.po | 28 + | |
| install_files/ansible-base/roles/tails-config/templates/nl.po | 27 + | |
| install_files/ansible-base/roles/tails-config/templates/pt_BR.po | 25 + | |
| install_files/ansible-base/roles/tails-config/templates/tr.po | 27 + | |
| install_files/ansible-base/roles/tails-config/templates/zh_Hant.po | 27 + | |
| install_files/ansible-base/roles/tor-hidden-services/tasks/install_tor.yml | 42 +- | |
| install_files/ansible-base/roles/upgrade/handlers/main.yml | 2 +- | |
| install_files/ansible-base/roles/upgrade/tasks/0-3pre-upgrade.yml | 14 +- | |
| install_files/ansible-base/roles/validate/files/validate-gpg-key.sh | 7 + | |
| install_files/ansible-base/roles/validate/files/validate-supported-locales.sh | 17 + | |
| install_files/ansible-base/roles/validate/tasks/main.yml | 2 + | |
| install_files/ansible-base/roles/validate/tasks/validate_ossec_info.yml | 52 - | |
| install_files/ansible-base/roles/validate/tasks/validate_supported_locales.yml | 4 + | |
| install_files/ansible-base/securedrop-configure.yml | 19 +- | |
| install_files/ansible-base/securedrop-development.yml | 14 +- | |
| install_files/ansible-base/securedrop-prod.yml | 23 +- | |
| install_files/ansible-base/securedrop-staging.yml | 26 +- | |
| install_files/ansible-base/tasks/reboot.yml | 2 +- | |
| install_files/ossec-server/DEBIAN/postrm | 4 +- | |
| install_files/securedrop-app-code/DEBIAN/control | 4 +- | |
| install_files/securedrop-app-code/DEBIAN/postinst | 15 +- | |
| install_files/securedrop-app-code/usr/share/doc/securedrop-app-code/changelog.Debian | 12 + | |
| install_files/securedrop-config/DEBIAN/control | 10 + | |
| install_files/securedrop-config/DEBIAN/postinst | 29 + | |
| install_files/securedrop-config/etc/apt/sources.list.d/tor.apt.freedom.press.list | 1 + | |
| install_files/securedrop-grsec/DEBIAN/control | 12 + | |
| install_files/securedrop-grsec/etc/kernel/postinst.d/paxctl-grub | 17 + | |
| install_files/securedrop-grsec/etc/sysctl.d/30-securedrop.conf | 1 + | |
| install_files/securedrop-keyring/DEBIAN/control | 2 +- | |
| install_files/securedrop-ossec-agent/DEBIAN/control | 4 +- | |
| install_files/securedrop-ossec-agent/var/ossec/etc/ossec.conf | 4 +- | |
| install_files/securedrop-ossec-server/DEBIAN/control | 4 +- | |
| install_files/securedrop-ossec-server/var/ossec/etc/ossec.conf | 3 +- | |
| install_files/securedrop-ossec-server/var/ossec/rules/local_rules.xml | 20 + | |
| install_files/securedrop-ossec-server/var/ossec/setup_gmail_test.sh | 60 - | |
| migration_scripts/0.2.1/0.2.1_collect.py | 97 - | |
| migration_scripts/0.2.1/0.3_migrate.py | 296 - | |
| migration_scripts/0.2.1/adjectives.txt | 14017 --------- | |
| migration_scripts/0.2.1/nouns.txt | 67749 ---------------------------------------- | |
| migration_scripts/0.2.1/old_crypto_util.py | 19 - | |
| migration_scripts/0.3pre/upgrade.sh | 138 - | |
| molecule/aws/aws-launch.yml | 84 + | |
| molecule/aws/create.yml | 103 + | |
| molecule/aws/destroy.yml | 27 + | |
| molecule/aws/molecule.yml | 48 + | |
| molecule/aws/playbook.yml | 1 + | |
| molecule/aws/reboot_and_wait.yml | 26 + | |
| {devops => molecule/aws}/scripts/app-tests.sh | 2 +- | |
| molecule/aws/scripts/ci-tester.sh | 23 + | |
| molecule/aws/side_effect.yml | 58 + | |
| molecule/aws/templates/ssh_config | 9 + | |
| {testinfra/functional => molecule/aws/tests}/test_tor_interfaces.py | 17 +- | |
| molecule/aws/tor.yml | 16 + | |
| molecule/builder/molecule.yml | 4 +- | |
| molecule/builder/tests/test_build_dependencies.py | 11 + | |
| molecule/builder/tests/test_securedrop_deb_package.py | 118 +- | |
| molecule/builder/tests/vars.yml | 11 +- | |
| securedrop-admin | 334 +- | |
| securedrop/.coveragerc | 2 +- | |
| securedrop/.dockerignore | 5 + | |
| securedrop/.rsync-filter | 21 + | |
| securedrop/.well-known/.gitignore | 1 + | |
| securedrop/Dockerfile | 56 + | |
| securedrop/Makefile | 77 + | |
| securedrop/babel.cfg | 6 + | |
| securedrop/bin/dev | 12 + | |
| securedrop/bin/test | 30 + | |
| securedrop/bin/update-user-guides | 21 + | |
| securedrop/codecov.yml | 2 + | |
| securedrop/config.py.example | 3 + | |
| securedrop/crypto_util.py | 44 +- | |
| securedrop/i18n.py | 168 + | |
| securedrop/journalist.py | 806 +- | |
| securedrop/journalist_app/__init__.py | 109 + | |
| securedrop/journalist_app/account.py | 69 + | |
| securedrop/journalist_app/admin.py | 243 + | |
| securedrop/journalist_app/col.py | 88 + | |
| securedrop/journalist_app/decorators.py | 19 + | |
| securedrop/journalist_app/forms.py | 63 + | |
| securedrop/journalist_app/main.py | 188 + | |
| securedrop/journalist_app/utils.py | 276 + | |
| securedrop/journalist_templates/_source_row.html | 14 +- | |
| securedrop/journalist_templates/account_edit_hotp_secret.html | 6 +- | |
| securedrop/journalist_templates/account_new_two_factor.html | 24 +- | |
| securedrop/journalist_templates/admin.html | 36 +- | |
| securedrop/journalist_templates/admin_add_user.html | 38 +- | |
| securedrop/journalist_templates/admin_edit_hotp_secret.html | 6 +- | |
| securedrop/journalist_templates/admin_new_user_two_factor.html | 26 +- | |
| securedrop/journalist_templates/base.html | 18 +- | |
| securedrop/journalist_templates/col.html | 60 +- | |
| securedrop/journalist_templates/config.html | 43 + | |
| securedrop/journalist_templates/delete.html | 6 +- | |
| securedrop/journalist_templates/edit_account.html | 70 +- | |
| securedrop/journalist_templates/flag.html | 6 +- | |
| securedrop/journalist_templates/index.html | 16 +- | |
| securedrop/journalist_templates/js-strings.html | 12 + | |
| securedrop/journalist_templates/locales.html | 28 + | |
| securedrop/journalist_templates/login.html | 14 +- | |
| securedrop/manage.py | 265 +- | |
| securedrop/pylintrc | 546 +- | |
| .../ansible-base/requirements.txt => securedrop/requirements/admin-requirements.txt | 2 +- | |
| install_files/ansible-base/requirements.in => securedrop/requirements/ansible.in | 0 | |
| securedrop/requirements/develop-requirements.in | 12 +- | |
| securedrop/requirements/develop-requirements.txt | 90 +- | |
| .../requirements/{securedrop-requirements.in => securedrop-app-code-requirements.in} | 2 +- | |
| securedrop/requirements/securedrop-app-code-requirements.txt | 31 + | |
| securedrop/requirements/securedrop-requirements.txt | 31 - | |
| securedrop/requirements/test-requirements.in | 2 - | |
| securedrop/requirements/test-requirements.txt | 30 +- | |
| securedrop/requirements/update_python_dependencies | 46 - | |
| securedrop/rm.py | 24 + | |
| securedrop/sass/_base.sass | 587 +- | |
| securedrop/sass/_source_index.sass | 5 +- | |
| securedrop/sass/_variables.sass | 5 + | |
| securedrop/sass/global/_body-tag.sass | 6 + | |
| securedrop/sass/global/_border-box-size-everything.sass | 5 + | |
| securedrop/sass/journalist.sass | 19 + | |
| securedrop/sass/{_font-awesome.sass => libraries/_font-awesome-iconography.sass} | 2 +- | |
| securedrop/sass/{ => libraries}/_normalize.sass | 2 +- | |
| securedrop/sass/modules/_aside.sass | 15 + | |
| securedrop/sass/modules/_banner-warning.sass | 9 + | |
| securedrop/sass/modules/_button-centering.sass | 4 + | |
| securedrop/sass/{_button-rules.sass => modules/_button.sass} | 11 +- | |
| securedrop/sass/modules/_center-text-align.sass | 3 + | |
| securedrop/sass/modules/_clearfix.sass | 3 + | |
| securedrop/sass/modules/_code.sass | 9 + | |
| securedrop/sass/modules/_codename-and-password.sass | 5 + | |
| securedrop/sass/modules/_cols.sass | 48 + | |
| securedrop/sass/modules/_confirm-prompt.sass | 6 + | |
| securedrop/sass/modules/_doc-check.sass | 3 + | |
| securedrop/sass/modules/_document-actions-button.sass | 4 + | |
| securedrop/sass/modules/_document-actions.sass | 7 + | |
| securedrop/sass/modules/_em-light-gray-emphasised-text.sass | 3 + | |
| securedrop/sass/modules/_flash.sass | 48 + | |
| securedrop/sass/modules/_footer.sass | 8 + | |
| securedrop/sass/modules/_form-validation-error.sass | 4 + | |
| securedrop/sass/modules/_grid-item.sass | 4 + | |
| securedrop/sass/modules/_header.sass | 14 + | |
| securedrop/sass/modules/_headline.sass | 23 + | |
| securedrop/sass/modules/_hr-horizontal-rule-line.sass | 11 + | |
| securedrop/sass/modules/_label.sass | 3 + | |
| securedrop/sass/modules/_link.sass | 9 + | |
| securedrop/sass/modules/_list-plain-and-starred.sass | 6 + | |
| securedrop/sass/modules/_logo.sass | 10 + | |
| securedrop/sass/modules/_logout.sass | 4 + | |
| securedrop/sass/modules/_main-content-area.sass | 5 + | |
| securedrop/sass/modules/_menu.sass | 67 + | |
| securedrop/sass/modules/_option.sass | 19 + | |
| securedrop/sass/modules/_panel.sass | 8 + | |
| securedrop/sass/modules/_pull.sass | 16 + | |
| securedrop/sass/modules/_qr-code-container.sass | 3 + | |
| securedrop/sass/modules/_regenerate-codename-button.sass | 14 + | |
| securedrop/sass/modules/_sd-button.sass | 7 + | |
| securedrop/sass/modules/_select-container.sass | 3 + | |
| securedrop/sass/modules/_select.sass | 11 + | |
| securedrop/sass/modules/_serious-text.sass | 4 + | |
| securedrop/sass/modules/_shared-secret.sass | 6 + | |
| securedrop/sass/modules/_snippet.sass | 45 + | |
| securedrop/sass/modules/_submission.sass | 23 + | |
| securedrop/sass/modules/_submissions.sass | 6 + | |
| securedrop/sass/modules/_text-link.sass | 3 + | |
| securedrop/sass/modules/_users-table.sass | 6 + | |
| securedrop/sass/modules/_visually-hidden.sass | 7 + | |
| securedrop/sass/modules/_warning.sass | 17 + | |
| securedrop/sass/source.sass | 69 +- | |
| securedrop/secure_tempfile.py | 6 +- | |
| securedrop/securedrop-admin | 334 + | |
| securedrop/source.py | 447 +- | |
| securedrop/source_app/__init__.py | 138 + | |
| securedrop/source_app/api.py | 20 + | |
| securedrop/source_app/decorators.py | 24 + | |
| securedrop/source_app/forms.py | 19 + | |
| securedrop/source_app/info.py | 30 + | |
| securedrop/source_app/main.py | 239 + | |
| securedrop/source_app/utils.py | 103 + | |
| securedrop/source_templates/base.html | 13 +- | |
| securedrop/source_templates/error.html | 6 +- | |
| securedrop/source_templates/first_submission_flashed_message.html | 8 +- | |
| securedrop/source_templates/generate.html | 27 +- | |
| securedrop/source_templates/index.html | 43 +- | |
| securedrop/source_templates/locales.html | 28 + | |
| securedrop/source_templates/login.html | 19 +- | |
| securedrop/source_templates/logout_flashed_message.html | 8 +- | |
| securedrop/source_templates/lookup.html | 70 +- | |
| securedrop/source_templates/next_submission_flashed_message.html | 2 +- | |
| securedrop/source_templates/notfound.html | 6 +- | |
| securedrop/source_templates/session_timeout.html | 8 + | |
| securedrop/source_templates/tor2web-warning.html | 8 +- | |
| securedrop/source_templates/use-tor-browser.html | 11 +- | |
| securedrop/source_templates/why-journalist-key.html | 26 +- | |
| securedrop/static/js/journalist.js | 43 +- | |
| securedrop/static/js/source.js | 4 +- | |
| securedrop/store.py | 26 +- | |
| securedrop/template_filters.py | 63 +- | |
| securedrop/tests/conftest.py | 10 + | |
| securedrop/tests/functional/functional_test.py | 35 +- | |
| securedrop/tests/functional/journalist_navigation_steps.py | 112 +- | |
| securedrop/tests/functional/make_account_changes.py | 6 +- | |
| securedrop/tests/functional/source_navigation_steps.py | 76 +- | |
| securedrop/tests/functional/test_admin_interface.py | 14 +- | |
| securedrop/tests/functional/test_journalist.py | 4 +- | |
| securedrop/tests/functional/test_source.py | 19 + | |
| securedrop/tests/functional/test_source_notfound.py | 4 +- | |
| securedrop/tests/functional/test_source_session_timeout.py | 25 + | |
| securedrop/tests/functional/test_source_warnings.py | 2 +- | |
| .../tests/functional/{submission_not_in_memory.py => test_submission_not_in_memory.py} | 22 +- | |
| securedrop/tests/functional/test_submit_and_retrieve_file.py | 4 +- | |
| securedrop/tests/functional/test_submit_and_retrieve_message.py | 4 +- | |
| securedrop/tests/i18n/code.py | 2 + | |
| securedrop/tests/i18n/journalist.desktop.in | 10 + | |
| securedrop/tests/i18n/source.desktop.in | 10 + | |
| securedrop/tests/pages-layout/functional_test.py | 12 +- | |
| securedrop/tests/pages-layout/test_journalist.py | 54 +- | |
| securedrop/tests/pages-layout/test_source.py | 77 +- | |
| securedrop/tests/test_2fa.py | 32 +- | |
| securedrop/tests/test_crypto_util.py | 23 +- | |
| securedrop/tests/test_i18n.py | 288 + | |
| securedrop/tests/test_integration.py | 23 +- | |
| securedrop/tests/test_journalist.py | 762 +- | |
| securedrop/tests/test_manage.py | 209 +- | |
| securedrop/tests/test_securedrop-admin.py | 79 + | |
| securedrop/tests/test_source.py | 448 +- | |
| securedrop/tests/test_store.py | 87 +- | |
| securedrop/tests/test_template_filters.py | 165 +- | |
| securedrop/tests/utils/async.py | 4 +- | |
| securedrop/tests/utils/db_helper.py | 38 +- | |
| securedrop/tests/utils/env.py | 11 +- | |
| securedrop/translations/ar/LC_MESSAGES/messages.po | 1347 + | |
| securedrop/translations/de_DE/LC_MESSAGES/messages.po | 1399 + | |
| securedrop/translations/es_ES/LC_MESSAGES/messages.po | 1394 + | |
| securedrop/translations/fr_FR/LC_MESSAGES/messages.po | 1401 + | |
| securedrop/translations/it_IT/LC_MESSAGES/messages.po | 1379 + | |
| securedrop/translations/messages.pot | 1172 + | |
| securedrop/translations/nb_NO/LC_MESSAGES/messages.po | 1358 + | |
| securedrop/translations/nl/LC_MESSAGES/messages.po | 1378 + | |
| securedrop/translations/pt_BR/LC_MESSAGES/messages.po | 1373 + | |
| securedrop/translations/tr/LC_MESSAGES/messages.po | 1367 + | |
| securedrop/translations/zh_Hant/LC_MESSAGES/messages.po | 1246 + | |
| securedrop/version.py | 2 +- | |
| securedrop/wordlist | 7604 +---- | |
| securedrop/wordlists/en.txt | 7603 +++++ | |
| securedrop/wordlists/fr.txt | 7384 +++++ | |
| testinfra/app/apache/test_apache_journalist_interface.py | 2 + | |
| testinfra/app/apache/test_apache_source_interface.py | 1 + | |
| testinfra/app/test_network.py | 3 +- | |
| testinfra/app/test_ossec.py | 8 +- | |
| testinfra/common/test_cron_apt.py | 2 +- | |
| testinfra/common/test_fpf_apt_repo.py | 28 +- | |
| testinfra/common/test_grsecurity.py | 2 + | |
| testinfra/common/test_ip6tables.py | 4 + | |
| testinfra/common/test_tor_config.py | 37 +- | |
| testinfra/common/test_tor_mirror.py | 76 + | |
| testinfra/common/test_user_config.py | 5 +- | |
| testinfra/development/test_development_application_settings.py | 5 - | |
| testinfra/development/test_development_environment.py | 16 +- | |
| testinfra/mon/test_network.py | 5 +- | |
| testinfra/mon/test_ossec.py | 6 +- | |
| testinfra/requirements.in | 2 + | |
| testinfra/requirements.txt | 74 - | |
| testinfra/test.py | 9 +- | |
| testinfra/vars/app-prod.yml | 6 +- | |
| testinfra/vars/app-staging.yml | 5 +- | |
| testinfra/vars/apptestclient.yml | 7 - | |
| testinfra/vars/mon-staging.yml | 14 + | |
| update_version.sh | 23 +- | |
| 522 files changed, 41177 insertions(+), 95919 deletions(-) | |
| create mode 100644 .github/CODEOWNERS | |
| create mode 100644 .mailmap | |
| create mode 100644 .yamllint | |
| create mode 100644 CONTRIBUTING.md | |
| delete mode 100644 devops/ansible_env | |
| create mode 100644 devops/docker/Dockerfile.linting | |
| delete mode 100644 devops/inventory/staging | |
| create mode 100644 devops/jenkins/TorNightlyPipeline | |
| delete mode 100755 devops/playbooks/aws-ci-startup.yml | |
| delete mode 100755 devops/playbooks/aws-ci-teardown.yml | |
| delete mode 100755 devops/playbooks/ci-app-tests.yml | |
| create mode 100644 devops/scripts/aws-jenkins-venv.sh | |
| delete mode 100755 devops/scripts/ci-build_only.sh | |
| delete mode 100755 devops/scripts/ci-runner.sh | |
| delete mode 100755 devops/scripts/ci-spinup.sh | |
| delete mode 100755 devops/scripts/ci-teardown.sh | |
| delete mode 100755 devops/scripts/ci-tester.sh | |
| delete mode 100755 devops/scripts/docs-detection | |
| create mode 100755 devops/scripts/rebase-develop.sh | |
| delete mode 100755 devops/scripts/spin-run-test.sh | |
| delete mode 100644 devops/templates/ssh_config | |
| delete mode 100644 devops/vars/staging.yml | |
| create mode 100644 docs/deployment/landing_page.rst | |
| create mode 100644 docs/deployment/minimum_security_requirements.rst | |
| create mode 100644 docs/deployment/sample_privacy_policy.rst | |
| create mode 100644 docs/deployment/whole_site_changes.rst | |
| create mode 100644 docs/development/setup_development.rst | |
| create mode 100644 docs/development/virtualizing_tails.rst | |
| create mode 100644 docs/diagrams/SecureDrop_DataFlow.draw | |
| create mode 100644 docs/diagrams/SecureDrop_DataFlow.png | |
| delete mode 100644 docs/google_authenticator.rst | |
| delete mode 100644 docs/images/admin_enter_verification.png | |
| delete mode 100644 docs/images/admin_main_home.png | |
| delete mode 100644 docs/images/admin_secondary_home.png | |
| create mode 100644 docs/images/devenv/tails-libvirt-boot-options.png | |
| create mode 100644 docs/images/devenv/tails-libvirt-filesystem-config.png | |
| create mode 100644 docs/images/labels/admin_workstation.xcf | |
| create mode 100644 docs/images/labels/app_server.xcf | |
| rename docs/images/labels/{sd_firewall.xcf => firewall.xcf} (59%) | |
| create mode 100644 docs/images/labels/journalist_workstation.xcf | |
| create mode 100644 docs/images/labels/mon_server.xcf | |
| delete mode 100644 docs/images/labels/sd_admin_workstation.xcf | |
| delete mode 100644 docs/images/labels/sd_app_server.xcf | |
| delete mode 100644 docs/images/labels/sd_journalist_workstation.xcf | |
| delete mode 100644 docs/images/labels/sd_mon_server.xcf | |
| rename docs/images/labels/{sd_secure_viewing_station_offline_warning.xcf => secure_viewing_station_offline_warning.xcf} (83%) | |
| delete mode 100644 docs/images/manual/document1.png | |
| delete mode 100644 docs/images/manual/document2.png | |
| delete mode 100644 docs/images/manual/document3.png | |
| delete mode 100644 docs/images/manual/document4.png | |
| delete mode 100644 docs/images/manual/document6.png | |
| delete mode 100644 docs/images/manual/document_flag_for_reply_button.png | |
| delete mode 100644 docs/images/manual/document_flagged_for_reply_notification.png | |
| delete mode 100644 docs/images/manual/journalist-admin_add_user_hotp.png | |
| delete mode 100644 docs/images/manual/journalist-admin_add_user_totp.png | |
| delete mode 100644 docs/images/manual/journalist-admin_new_user_two_factor_hotp.png | |
| delete mode 100644 docs/images/manual/journalist-admin_new_user_two_factor_totp.png | |
| delete mode 100644 docs/images/manual/logout-notification.png | |
| create mode 100644 docs/images/manual/screenshots/journalist-admin_add_user_hotp.png | |
| create mode 100644 docs/images/manual/screenshots/journalist-admin_add_user_totp.png | |
| create mode 100644 docs/images/manual/screenshots/journalist-admin_changes_logo_image.png | |
| create mode 100644 docs/images/manual/screenshots/journalist-admin_index_no_documents.png | |
| create mode 100644 docs/images/manual/screenshots/journalist-admin_interface_index.png | |
| create mode 100644 docs/images/manual/screenshots/journalist-admin_new_user_two_factor_hotp.png | |
| create mode 100644 docs/images/manual/screenshots/journalist-admin_new_user_two_factor_totp.png | |
| create mode 100644 docs/images/manual/screenshots/journalist-admin_ossec_alert_button.png | |
| create mode 100644 docs/images/manual/screenshots/journalist-admin_system_config_page.png | |
| create mode 100644 docs/images/manual/screenshots/journalist-clicks_on_source_and_selects_documents.png | |
| create mode 100644 docs/images/manual/screenshots/journalist-col_flagged.png | |
| create mode 100644 docs/images/manual/screenshots/journalist-col_has_no_key.png | |
| create mode 100644 docs/images/manual/screenshots/journalist-composes_reply.png | |
| create mode 100644 docs/images/manual/screenshots/journalist-index_javascript.png | |
| create mode 100644 docs/images/manual/screenshots/journalist-index_with_text.png | |
| create mode 100644 docs/images/manual/screenshots/source-checks_for_reply.png | |
| create mode 100644 docs/images/manual/screenshots/source-deletes_reply.png | |
| create mode 100644 docs/images/manual/screenshots/source-enter-codename-in-login.png | |
| create mode 100644 docs/images/manual/screenshots/source-flagged.png | |
| create mode 100644 docs/images/manual/screenshots/source-generate.png | |
| create mode 100644 docs/images/manual/screenshots/source-index.png | |
| create mode 100644 docs/images/manual/screenshots/source-logout_flashed_message.png | |
| create mode 100644 docs/images/manual/screenshots/source-lookup.png | |
| create mode 100644 docs/images/manual/screenshots/source-submission_entered_text.png | |
| create mode 100644 docs/images/manual/securedrop-security-slider-warning.png | |
| delete mode 100644 docs/images/manual/source-step1.png | |
| delete mode 100644 docs/images/manual/source-step10.png | |
| delete mode 100644 docs/images/manual/source-step11.png | |
| delete mode 100644 docs/images/manual/source-step2.png | |
| delete mode 100644 docs/images/manual/source-step3-and-step7.png | |
| delete mode 100644 docs/images/manual/source-step4.png | |
| delete mode 100644 docs/images/manual/source-step5.png | |
| delete mode 100644 docs/images/manual/source-step6.png | |
| delete mode 100644 docs/images/manual/source-step8.png | |
| delete mode 100644 docs/images/manual/source-step9.png | |
| create mode 100644 docs/images/manual/source-turn-slider-to-high.png | |
| delete mode 100644 docs/images/manual/source1.png | |
| delete mode 100644 docs/images/manual/source10.png | |
| delete mode 100644 docs/images/manual/source11.png | |
| delete mode 100644 docs/images/manual/source2.png | |
| delete mode 100644 docs/images/manual/source3.png | |
| delete mode 100644 docs/images/manual/source4.png | |
| delete mode 100644 docs/images/manual/source5.png | |
| delete mode 100644 docs/images/manual/source6.png | |
| delete mode 100644 docs/images/manual/source7.png | |
| delete mode 100644 docs/images/manual/source8.png | |
| delete mode 100644 docs/images/manual/source9.png | |
| delete mode 100644 docs/images/manual/source_flagged_for_reply.png | |
| delete mode 100644 docs/images/manual/source_generate_codename.png | |
| delete mode 100644 docs/images/manual/source_landing_page_disable_javascript.png | |
| delete mode 100644 docs/images/manual/source_landing_page_no_warning.png | |
| delete mode 100644 docs/images/manual/source_landing_with_warning.png | |
| delete mode 100644 docs/images/manual/source_reply_deleted.png | |
| delete mode 100644 docs/images/manual/source_reply_from_journalist.png | |
| delete mode 100644 docs/images/manual/source_second_login.png | |
| delete mode 100644 docs/images/manual/source_submission_received.png | |
| delete mode 100644 docs/images/manual/source_upload_submission.png | |
| delete mode 100644 docs/images/manual/viewing1.jpg | |
| delete mode 100644 docs/images/manual/viewing2.jpg | |
| delete mode 100644 docs/images/manual/viewing3.jpg | |
| delete mode 100644 docs/images/manual/viewing4.jpg | |
| delete mode 100644 docs/images/manual/viewing5.jpg | |
| delete mode 100644 docs/images/manual/viewing6.jpg | |
| delete mode 100644 docs/images/manual/viewing7.jpg | |
| delete mode 100644 docs/images/manual/viewing8.jpg | |
| create mode 100644 docs/images/weblate/admin-lock.png | |
| create mode 100644 docs/images/weblate/admin-locked.png | |
| create mode 100644 docs/images/weblate/admin-unlock.png | |
| create mode 100644 docs/images/weblate/admin-unlocked.png | |
| delete mode 100644 docs/images/yubikey_oath_hotp_configuration.png | |
| create mode 100644 docs/images/yubikey_oath_htop_configuration.png | |
| create mode 100644 docs/images/yubikey_overview.png | |
| create mode 100644 docs/includes/docs-branches.txt | |
| create mode 100644 docs/includes/otp-app.txt | |
| create mode 100644 docs/includes/rerun-install-is-safe.txt | |
| create mode 100644 docs/servers_2fa.rst | |
| create mode 100644 docs/threat_model/dataflow.rst | |
| rename docs/{development => threat_model}/threat_model.rst (97%) | |
| create mode 100644 docs/upgrade/0.4.x_to_0.5.rst | |
| delete mode 100644 install_files/ansible-base/action_plugins/synchronize.py | |
| delete mode 100644 install_files/ansible-base/requirements.all | |
| create mode 100644 install_files/ansible-base/roles/app-test/tasks/modern_gettext.yml | |
| create mode 100644 install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/tasks/translations.yml | |
| create mode 100644 install_files/ansible-base/roles/ci-tweaks/tasks/main.yml | |
| create mode 100644 install_files/ansible-base/roles/common/tasks/post_ubuntu_install_checks.yml | |
| delete mode 100644 install_files/ansible-base/roles/grsecurity/meta/main.yml | |
| create mode 100644 install_files/ansible-base/roles/tails-config/templates/ar.po | |
| create mode 100644 install_files/ansible-base/roles/tails-config/templates/de_DE.po | |
| create mode 100644 install_files/ansible-base/roles/tails-config/templates/desktop-journalist-icon.j2 | |
| rename install_files/ansible-base/roles/tails-config/templates/{desktop-icon.j2 => desktop-journalist-icon.j2.in} (64%) | |
| create mode 100644 install_files/ansible-base/roles/tails-config/templates/desktop-source-icon.j2 | |
| create mode 100644 install_files/ansible-base/roles/tails-config/templates/desktop-source-icon.j2.in | |
| create mode 100644 install_files/ansible-base/roles/tails-config/templates/desktop.pot | |
| create mode 100644 install_files/ansible-base/roles/tails-config/templates/es_ES.po | |
| create mode 100644 install_files/ansible-base/roles/tails-config/templates/fr.po | |
| create mode 100644 install_files/ansible-base/roles/tails-config/templates/it.po | |
| create mode 100644 install_files/ansible-base/roles/tails-config/templates/nb_NO.po | |
| create mode 100644 install_files/ansible-base/roles/tails-config/templates/nl.po | |
| create mode 100644 install_files/ansible-base/roles/tails-config/templates/pt_BR.po | |
| create mode 100644 install_files/ansible-base/roles/tails-config/templates/tr.po | |
| create mode 100644 install_files/ansible-base/roles/tails-config/templates/zh_Hant.po | |
| create mode 100755 install_files/ansible-base/roles/validate/files/validate-supported-locales.sh | |
| create mode 100644 install_files/ansible-base/roles/validate/tasks/validate_supported_locales.yml | |
| create mode 100644 install_files/securedrop-config/DEBIAN/control | |
| create mode 100755 install_files/securedrop-config/DEBIAN/postinst | |
| create mode 100644 install_files/securedrop-config/etc/apt/sources.list.d/tor.apt.freedom.press.list | |
| create mode 100644 install_files/securedrop-grsec/DEBIAN/control | |
| create mode 100755 install_files/securedrop-grsec/etc/kernel/postinst.d/paxctl-grub | |
| create mode 100644 install_files/securedrop-grsec/etc/sysctl.d/30-securedrop.conf | |
| delete mode 100755 install_files/securedrop-ossec-server/var/ossec/setup_gmail_test.sh | |
| delete mode 100755 migration_scripts/0.2.1/0.2.1_collect.py | |
| delete mode 100755 migration_scripts/0.2.1/0.3_migrate.py | |
| delete mode 100644 migration_scripts/0.2.1/adjectives.txt | |
| delete mode 100644 migration_scripts/0.2.1/nouns.txt | |
| delete mode 100644 migration_scripts/0.2.1/old_crypto_util.py | |
| delete mode 100755 migration_scripts/0.3pre/upgrade.sh | |
| create mode 100644 molecule/aws/aws-launch.yml | |
| create mode 100644 molecule/aws/create.yml | |
| create mode 100644 molecule/aws/destroy.yml | |
| create mode 100644 molecule/aws/molecule.yml | |
| create mode 120000 molecule/aws/playbook.yml | |
| create mode 100755 molecule/aws/reboot_and_wait.yml | |
| rename {devops => molecule/aws}/scripts/app-tests.sh (85%) | |
| create mode 100755 molecule/aws/scripts/ci-tester.sh | |
| create mode 100755 molecule/aws/side_effect.yml | |
| create mode 100644 molecule/aws/templates/ssh_config | |
| rename {testinfra/functional => molecule/aws/tests}/test_tor_interfaces.py (63%) | |
| create mode 100644 molecule/aws/tor.yml | |
| create mode 100644 securedrop/.dockerignore | |
| create mode 100644 securedrop/.well-known/.gitignore | |
| create mode 100644 securedrop/Dockerfile | |
| create mode 100644 securedrop/Makefile | |
| create mode 100755 securedrop/bin/dev | |
| create mode 100755 securedrop/bin/test | |
| create mode 100755 securedrop/bin/update-user-guides | |
| create mode 100644 securedrop/codecov.yml | |
| create mode 100644 securedrop/i18n.py | |
| create mode 100644 securedrop/journalist_app/__init__.py | |
| create mode 100644 securedrop/journalist_app/account.py | |
| create mode 100644 securedrop/journalist_app/admin.py | |
| create mode 100644 securedrop/journalist_app/col.py | |
| create mode 100644 securedrop/journalist_app/decorators.py | |
| create mode 100644 securedrop/journalist_app/forms.py | |
| create mode 100644 securedrop/journalist_app/main.py | |
| create mode 100644 securedrop/journalist_app/utils.py | |
| create mode 100644 securedrop/journalist_templates/config.html | |
| create mode 100644 securedrop/journalist_templates/js-strings.html | |
| create mode 100644 securedrop/journalist_templates/locales.html | |
| rename install_files/ansible-base/requirements.txt => securedrop/requirements/admin-requirements.txt (98%) | |
| rename install_files/ansible-base/requirements.in => securedrop/requirements/ansible.in (100%) | |
| rename securedrop/requirements/{securedrop-requirements.in => securedrop-app-code-requirements.in} (87%) | |
| create mode 100644 securedrop/requirements/securedrop-app-code-requirements.txt | |
| delete mode 100644 securedrop/requirements/securedrop-requirements.txt | |
| delete mode 100755 securedrop/requirements/update_python_dependencies | |
| create mode 100644 securedrop/rm.py | |
| create mode 100644 securedrop/sass/global/_body-tag.sass | |
| create mode 100644 securedrop/sass/global/_border-box-size-everything.sass | |
| rename securedrop/sass/{_font-awesome.sass => libraries/_font-awesome-iconography.sass} (99%) | |
| rename securedrop/sass/{ => libraries}/_normalize.sass (99%) | |
| create mode 100644 securedrop/sass/modules/_aside.sass | |
| create mode 100644 securedrop/sass/modules/_banner-warning.sass | |
| create mode 100644 securedrop/sass/modules/_button-centering.sass | |
| rename securedrop/sass/{_button-rules.sass => modules/_button.sass} (95%) | |
| create mode 100644 securedrop/sass/modules/_center-text-align.sass | |
| create mode 100644 securedrop/sass/modules/_clearfix.sass | |
| create mode 100644 securedrop/sass/modules/_code.sass | |
| create mode 100644 securedrop/sass/modules/_codename-and-password.sass | |
| create mode 100644 securedrop/sass/modules/_cols.sass | |
| create mode 100644 securedrop/sass/modules/_confirm-prompt.sass | |
| create mode 100644 securedrop/sass/modules/_doc-check.sass | |
| create mode 100644 securedrop/sass/modules/_document-actions-button.sass | |
| create mode 100644 securedrop/sass/modules/_document-actions.sass | |
| create mode 100644 securedrop/sass/modules/_em-light-gray-emphasised-text.sass | |
| create mode 100644 securedrop/sass/modules/_flash.sass | |
| create mode 100644 securedrop/sass/modules/_footer.sass | |
| create mode 100644 securedrop/sass/modules/_form-validation-error.sass | |
| create mode 100644 securedrop/sass/modules/_grid-item.sass | |
| create mode 100644 securedrop/sass/modules/_header.sass | |
| create mode 100644 securedrop/sass/modules/_headline.sass | |
| create mode 100644 securedrop/sass/modules/_hr-horizontal-rule-line.sass | |
| create mode 100644 securedrop/sass/modules/_label.sass | |
| create mode 100644 securedrop/sass/modules/_link.sass | |
| create mode 100644 securedrop/sass/modules/_list-plain-and-starred.sass | |
| create mode 100644 securedrop/sass/modules/_logo.sass | |
| create mode 100644 securedrop/sass/modules/_logout.sass | |
| create mode 100644 securedrop/sass/modules/_main-content-area.sass | |
| create mode 100644 securedrop/sass/modules/_menu.sass | |
| create mode 100644 securedrop/sass/modules/_option.sass | |
| create mode 100644 securedrop/sass/modules/_panel.sass | |
| create mode 100644 securedrop/sass/modules/_pull.sass | |
| create mode 100644 securedrop/sass/modules/_qr-code-container.sass | |
| create mode 100644 securedrop/sass/modules/_regenerate-codename-button.sass | |
| create mode 100644 securedrop/sass/modules/_sd-button.sass | |
| create mode 100644 securedrop/sass/modules/_select-container.sass | |
| create mode 100644 securedrop/sass/modules/_select.sass | |
| create mode 100644 securedrop/sass/modules/_serious-text.sass | |
| create mode 100644 securedrop/sass/modules/_shared-secret.sass | |
| create mode 100644 securedrop/sass/modules/_snippet.sass | |
| create mode 100644 securedrop/sass/modules/_submission.sass | |
| create mode 100644 securedrop/sass/modules/_submissions.sass | |
| create mode 100644 securedrop/sass/modules/_text-link.sass | |
| create mode 100644 securedrop/sass/modules/_users-table.sass | |
| create mode 100644 securedrop/sass/modules/_visually-hidden.sass | |
| create mode 100644 securedrop/sass/modules/_warning.sass | |
| create mode 100755 securedrop/securedrop-admin | |
| create mode 100644 securedrop/source_app/__init__.py | |
| create mode 100644 securedrop/source_app/api.py | |
| create mode 100644 securedrop/source_app/decorators.py | |
| create mode 100644 securedrop/source_app/forms.py | |
| create mode 100644 securedrop/source_app/info.py | |
| create mode 100644 securedrop/source_app/main.py | |
| create mode 100644 securedrop/source_app/utils.py | |
| create mode 100644 securedrop/source_templates/locales.html | |
| create mode 100644 securedrop/source_templates/session_timeout.html | |
| create mode 100644 securedrop/tests/functional/test_source.py | |
| create mode 100644 securedrop/tests/functional/test_source_session_timeout.py | |
| rename securedrop/tests/functional/{submission_not_in_memory.py => test_submission_not_in_memory.py} (83%) | |
| create mode 100644 securedrop/tests/i18n/journalist.desktop.in | |
| create mode 100644 securedrop/tests/i18n/source.desktop.in | |
| create mode 100644 securedrop/tests/test_i18n.py | |
| create mode 100644 securedrop/tests/test_securedrop-admin.py | |
| create mode 100644 securedrop/translations/ar/LC_MESSAGES/messages.po | |
| create mode 100644 securedrop/translations/de_DE/LC_MESSAGES/messages.po | |
| create mode 100644 securedrop/translations/es_ES/LC_MESSAGES/messages.po | |
| create mode 100644 securedrop/translations/fr_FR/LC_MESSAGES/messages.po | |
| create mode 100644 securedrop/translations/it_IT/LC_MESSAGES/messages.po | |
| create mode 100644 securedrop/translations/messages.pot | |
| create mode 100644 securedrop/translations/nb_NO/LC_MESSAGES/messages.po | |
| create mode 100644 securedrop/translations/nl/LC_MESSAGES/messages.po | |
| create mode 100644 securedrop/translations/pt_BR/LC_MESSAGES/messages.po | |
| create mode 100644 securedrop/translations/tr/LC_MESSAGES/messages.po | |
| create mode 100644 securedrop/translations/zh_Hant/LC_MESSAGES/messages.po | |
| mode change 100644 => 120000 securedrop/wordlist | |
| create mode 100644 securedrop/wordlists/en.txt | |
| create mode 100644 securedrop/wordlists/fr.txt | |
| create mode 100644 testinfra/common/test_tor_mirror.py | |
| delete mode 100644 testinfra/requirements.txt | |
| delete mode 100644 testinfra/vars/apptestclient.yml | |
| [conor@October:~/freedomofpress/securedrop] [sd] try-merging-0.5.1-into-master+* 2s ± | |
| $ git checkout - | |
| Switched to branch 'master' | |
| [conor@October:~/freedomofpress/securedrop] [sd] master+* ± | |
| $ git checkout . | |
| [conor@October:~/freedomofpress/securedrop] [sd] master+* ± | |
| $ | |
| [conor@October:~/freedomofpress/securedrop] [sd] master+* ± | |
| $ git checkout -b try-merging-0.5.1-into-master-again | |
| Switched to a new branch 'try-merging-0.5.1-into-master-again' | |
| [conor@October:~/freedomofpress/securedrop] [sd] try-merging-0.5.1-into-master-again+* ± | |
| $ git merge release/0.5.1 | |
| Removing testinfra/vars/apptestclient.yml | |
| Removing testinfra/requirements.txt | |
| Auto-merging securedrop/tests/functional/test_submission_not_in_memory.py | |
| Auto-merging securedrop/sass/modules/_button.sass | |
| Auto-merging securedrop/sass/libraries/_normalize.sass | |
| Auto-merging securedrop/sass/libraries/_font-awesome-iconography.sass | |
| Removing securedrop/requirements/update_python_dependencies | |
| Removing securedrop/requirements/securedrop-requirements.txt | |
| Auto-merging securedrop/requirements/securedrop-app-code-requirements.in | |
| Auto-merging securedrop/requirements/admin-requirements.txt | |
| Auto-merging molecule/aws/tests/test_tor_interfaces.py | |
| Auto-merging molecule/aws/scripts/app-tests.sh | |
| Removing migration_scripts/0.3pre/upgrade.sh | |
| Removing migration_scripts/0.2.1/old_crypto_util.py | |
| Removing migration_scripts/0.2.1/nouns.txt | |
| Removing migration_scripts/0.2.1/adjectives.txt | |
| Removing migration_scripts/0.2.1/0.3_migrate.py | |
| Removing migration_scripts/0.2.1/0.2.1_collect.py | |
| Removing install_files/securedrop-ossec-server/var/ossec/setup_gmail_test.sh | |
| Auto-merging install_files/ansible-base/roles/tails-config/templates/desktop-journalist-icon.j2.in | |
| Removing install_files/ansible-base/roles/grsecurity/meta/main.yml | |
| Removing install_files/ansible-base/requirements.all | |
| Removing install_files/ansible-base/action_plugins/synchronize.py | |
| Auto-merging docs/threat_model/threat_model.rst | |
| Removing docs/images/yubikey_oath_hotp_configuration.png | |
| Removing docs/images/manual/viewing8.jpg | |
| Removing docs/images/manual/viewing7.jpg | |
| Removing docs/images/manual/viewing6.jpg | |
| Removing docs/images/manual/viewing5.jpg | |
| Removing docs/images/manual/viewing4.jpg | |
| Removing docs/images/manual/viewing3.jpg | |
| Removing docs/images/manual/viewing2.jpg | |
| Removing docs/images/manual/viewing1.jpg | |
| Removing docs/images/manual/source_upload_submission.png | |
| Removing docs/images/manual/source_submission_received.png | |
| Removing docs/images/manual/source_second_login.png | |
| Removing docs/images/manual/source_reply_from_journalist.png | |
| Removing docs/images/manual/source_reply_deleted.png | |
| Removing docs/images/manual/source_landing_with_warning.png | |
| Removing docs/images/manual/source_landing_page_no_warning.png | |
| Removing docs/images/manual/source_landing_page_disable_javascript.png | |
| Removing docs/images/manual/source_generate_codename.png | |
| Removing docs/images/manual/source_flagged_for_reply.png | |
| Removing docs/images/manual/source9.png | |
| Removing docs/images/manual/source8.png | |
| Removing docs/images/manual/source7.png | |
| Removing docs/images/manual/source6.png | |
| Removing docs/images/manual/source5.png | |
| Removing docs/images/manual/source4.png | |
| Removing docs/images/manual/source3.png | |
| Removing docs/images/manual/source2.png | |
| Removing docs/images/manual/source11.png | |
| Removing docs/images/manual/source10.png | |
| Removing docs/images/manual/source1.png | |
| Removing docs/images/manual/source-step9.png | |
| Removing docs/images/manual/source-step8.png | |
| Removing docs/images/manual/source-step6.png | |
| Removing docs/images/manual/source-step5.png | |
| Removing docs/images/manual/source-step4.png | |
| Removing docs/images/manual/source-step3-and-step7.png | |
| Removing docs/images/manual/source-step2.png | |
| Removing docs/images/manual/source-step11.png | |
| Removing docs/images/manual/source-step10.png | |
| Removing docs/images/manual/source-step1.png | |
| Removing docs/images/manual/logout-notification.png | |
| Removing docs/images/manual/journalist-admin_new_user_two_factor_totp.png | |
| Removing docs/images/manual/journalist-admin_new_user_two_factor_hotp.png | |
| Removing docs/images/manual/journalist-admin_add_user_totp.png | |
| Removing docs/images/manual/journalist-admin_add_user_hotp.png | |
| Removing docs/images/manual/document_flagged_for_reply_notification.png | |
| Removing docs/images/manual/document_flag_for_reply_button.png | |
| Removing docs/images/manual/document6.png | |
| Removing docs/images/manual/document4.png | |
| Removing docs/images/manual/document3.png | |
| Removing docs/images/manual/document2.png | |
| Removing docs/images/manual/document1.png | |
| Auto-merging docs/images/labels/secure_viewing_station_offline_warning.xcf | |
| Removing docs/images/labels/sd_mon_server.xcf | |
| Removing docs/images/labels/sd_journalist_workstation.xcf | |
| Removing docs/images/labels/sd_app_server.xcf | |
| Removing docs/images/labels/sd_admin_workstation.xcf | |
| Auto-merging docs/images/labels/firewall.xcf | |
| Removing docs/images/admin_secondary_home.png | |
| Removing docs/images/admin_main_home.png | |
| Removing docs/images/admin_enter_verification.png | |
| Removing docs/google_authenticator.rst | |
| Removing devops/vars/staging.yml | |
| Removing devops/templates/ssh_config | |
| Removing devops/scripts/spin-run-test.sh | |
| Removing devops/scripts/docs-detection | |
| Removing devops/scripts/ci-tester.sh | |
| Removing devops/scripts/ci-teardown.sh | |
| Removing devops/scripts/ci-spinup.sh | |
| Removing devops/scripts/ci-runner.sh | |
| Removing devops/scripts/ci-build_only.sh | |
| Removing devops/playbooks/ci-app-tests.yml | |
| Removing devops/playbooks/aws-ci-teardown.yml | |
| Removing devops/playbooks/aws-ci-startup.yml | |
| Removing devops/inventory/staging | |
| Removing devops/ansible_env | |
| Merge made by the 'recursive' strategy. | |
| .circleci/config.yml | 150 +- | |
| .github/CODEOWNERS | 10 + | |
| .gitignore | 3 + | |
| .mailmap | 20 + | |
| .travis.yml | 13 +- | |
| .yamllint | 6 + | |
| CONTRIBUTING.md | 10 + | |
| Makefile | 98 +- | |
| README.md | 20 +- | |
| Vagrantfile | 1 + | |
| changelog.md | 101 +- | |
| devops/ansible_env | 6 - | |
| devops/docker/Dockerfile.linting | 12 + | |
| devops/inventory/staging | 24 - | |
| devops/jenkins/TorNightlyPipeline | 61 + | |
| devops/playbooks/aws-ci-startup.yml | 165 - | |
| devops/playbooks/aws-ci-teardown.yml | 72 - | |
| devops/playbooks/ci-app-tests.yml | 23 - | |
| devops/scripts/aws-jenkins-venv.sh | 7 + | |
| devops/scripts/ci-build_only.sh | 9 - | |
| devops/scripts/ci-runner.sh | 18 - | |
| devops/scripts/ci-spinup.sh | 8 - | |
| devops/scripts/ci-teardown.sh | 13 - | |
| devops/scripts/ci-tester.sh | 47 - | |
| devops/scripts/docs-detection | 3 - | |
| devops/scripts/local-setup.sh | 3 +- | |
| devops/scripts/rebase-develop.sh | 21 + | |
| devops/scripts/spin-run-test.sh | 19 - | |
| devops/templates/ssh_config | 13 - | |
| devops/vars/staging.yml | 8 - | |
| docs/admin.rst | 247 +- | |
| docs/backup_workstations.rst | 10 +- | |
| docs/before_you_begin.rst | 11 +- | |
| docs/conf.py | 4 +- | |
| docs/configure_admin_workstation_post_install.rst | 4 +- | |
| docs/create_admin_account.rst | 9 +- | |
| docs/deployment/landing_page.rst | 328 + | |
| docs/deployment/minimum_security_requirements.rst | 19 + | |
| docs/deployment/sample_privacy_policy.rst | 97 + | |
| docs/deployment/whole_site_changes.rst | 33 + | |
| docs/deployment_practices.rst | 307 +- | |
| docs/development/contributor_guidelines.rst | 34 +- | |
| docs/development/documentation_guidelines.rst | 21 +- | |
| docs/development/getting_started.rst | 345 +- | |
| docs/development/i18n.rst | 276 +- | |
| docs/development/l10n.rst | 34 + | |
| docs/development/setup_development.rst | 163 + | |
| docs/development/testing_application_tests.rst | 9 +- | |
| docs/development/tips_and_tricks.rst | 4 +- | |
| docs/development/updating_ossec.rst | 6 +- | |
| docs/development/virtual_environments.rst | 99 +- | |
| docs/development/virtualizing_tails.rst | 306 + | |
| docs/diagrams/README.md | 4 +- | |
| docs/diagrams/SecureDrop_DataFlow.draw | 1 + | |
| docs/diagrams/SecureDrop_DataFlow.png | Bin 0 -> 128701 bytes | |
| docs/generate_securedrop_application_key.rst | 37 +- | |
| docs/getting_the_most_out_of_securedrop.rst | 21 +- | |
| docs/google_authenticator.rst | 48 - | |
| docs/hardware.rst | 139 +- | |
| docs/https_source_interface.rst | 31 +- | |
| docs/images/admin_enter_verification.png | Bin 87208 -> 0 bytes | |
| docs/images/admin_main_home.png | Bin 45401 -> 0 bytes | |
| docs/images/admin_secondary_home.png | Bin 53027 -> 0 bytes | |
| docs/images/devenv/tails-libvirt-boot-options.png | Bin 0 -> 55007 bytes | |
| docs/images/devenv/tails-libvirt-filesystem-config.png | Bin 0 -> 61175 bytes | |
| docs/images/install/exportkey2.png | Bin 42442 -> 45334 bytes | |
| docs/images/labels/admin_workstation.png | Bin 23100 -> 25786 bytes | |
| docs/images/labels/admin_workstation.xcf | Bin 0 -> 89673 bytes | |
| docs/images/labels/app_server.png | Bin 20795 -> 21084 bytes | |
| docs/images/labels/app_server.xcf | Bin 0 -> 91968 bytes | |
| docs/images/labels/firewall.png | Bin 12683 -> 12736 bytes | |
| docs/images/labels/{sd_firewall.xcf => firewall.xcf} | Bin 55019 -> 56354 bytes | |
| docs/images/labels/journalist_workstation.png | Bin 25731 -> 24979 bytes | |
| docs/images/labels/journalist_workstation.xcf | Bin 0 -> 110345 bytes | |
| docs/images/labels/mon_server.png | Bin 21587 -> 21923 bytes | |
| docs/images/labels/mon_server.xcf | Bin 0 -> 81992 bytes | |
| docs/images/labels/sd_admin_workstation.xcf | Bin 95497 -> 0 bytes | |
| docs/images/labels/sd_app_server.xcf | Bin 89410 -> 0 bytes | |
| docs/images/labels/sd_journalist_workstation.xcf | Bin 109832 -> 0 bytes | |
| docs/images/labels/sd_mon_server.xcf | Bin 79446 -> 0 bytes | |
| docs/images/labels/secure_viewing_station_offline_warning.png | Bin 97776 -> 100862 bytes | |
| ..._viewing_station_offline_warning.xcf => secure_viewing_station_offline_warning.xcf} | Bin 201324 -> 208519 bytes | |
| docs/images/labels/usb_admin.png | Bin 10782 -> 10203 bytes | |
| docs/images/labels/usb_admin.xcf | Bin 42540 -> 49532 bytes | |
| docs/images/labels/usb_file_transfer.png | Bin 7864 -> 8176 bytes | |
| docs/images/labels/usb_file_transfer.xcf | Bin 53705 -> 55885 bytes | |
| docs/images/labels/usb_journalist.png | Bin 14475 -> 14706 bytes | |
| docs/images/labels/usb_journalist.xcf | Bin 52213 -> 63438 bytes | |
| docs/images/labels/usb_svs.png | Bin 9711 -> 7938 bytes | |
| docs/images/labels/usb_svs.xcf | Bin 33497 -> 39861 bytes | |
| docs/images/manual/document1.png | Bin 66612 -> 0 bytes | |
| docs/images/manual/document2.png | Bin 57988 -> 0 bytes | |
| docs/images/manual/document3.png | Bin 88929 -> 0 bytes | |
| docs/images/manual/document4.png | Bin 81197 -> 0 bytes | |
| docs/images/manual/document6.png | Bin 51023 -> 0 bytes | |
| docs/images/manual/document_flag_for_reply_button.png | Bin 88121 -> 0 bytes | |
| docs/images/manual/document_flagged_for_reply_notification.png | Bin 93103 -> 0 bytes | |
| docs/images/manual/journalist-admin_add_user_hotp.png | Bin 34888 -> 0 bytes | |
| docs/images/manual/journalist-admin_add_user_totp.png | Bin 32465 -> 0 bytes | |
| docs/images/manual/journalist-admin_new_user_two_factor_hotp.png | Bin 30100 -> 0 bytes | |
| docs/images/manual/journalist-admin_new_user_two_factor_totp.png | Bin 79223 -> 0 bytes | |
| docs/images/manual/logout-notification.png | Bin 105016 -> 0 bytes | |
| docs/images/manual/restart-tor-browser.png | Bin 97023 -> 30725 bytes | |
| docs/images/manual/screenshots/journalist-admin_add_user_hotp.png | Bin 0 -> 37460 bytes | |
| docs/images/manual/screenshots/journalist-admin_add_user_totp.png | Bin 0 -> 34394 bytes | |
| docs/images/manual/screenshots/journalist-admin_changes_logo_image.png | Bin 0 -> 56170 bytes | |
| docs/images/manual/screenshots/journalist-admin_index_no_documents.png | Bin 0 -> 23511 bytes | |
| docs/images/manual/screenshots/journalist-admin_interface_index.png | Bin 0 -> 34537 bytes | |
| docs/images/manual/screenshots/journalist-admin_new_user_two_factor_hotp.png | Bin 0 -> 32273 bytes | |
| docs/images/manual/screenshots/journalist-admin_new_user_two_factor_totp.png | Bin 0 -> 79618 bytes | |
| docs/images/manual/screenshots/journalist-admin_ossec_alert_button.png | Bin 0 -> 57433 bytes | |
| docs/images/manual/screenshots/journalist-admin_system_config_page.png | Bin 0 -> 52739 bytes | |
| docs/images/manual/screenshots/journalist-clicks_on_source_and_selects_documents.png | Bin 0 -> 69612 bytes | |
| docs/images/manual/screenshots/journalist-col_flagged.png | Bin 0 -> 64843 bytes | |
| docs/images/manual/screenshots/journalist-col_has_no_key.png | Bin 0 -> 60646 bytes | |
| docs/images/manual/screenshots/journalist-composes_reply.png | Bin 0 -> 66911 bytes | |
| docs/images/manual/screenshots/journalist-index_javascript.png | Bin 0 -> 33597 bytes | |
| docs/images/manual/screenshots/journalist-index_with_text.png | Bin 0 -> 21955 bytes | |
| docs/images/manual/screenshots/source-checks_for_reply.png | Bin 0 -> 81393 bytes | |
| docs/images/manual/screenshots/source-deletes_reply.png | Bin 0 -> 60910 bytes | |
| docs/images/manual/screenshots/source-enter-codename-in-login.png | Bin 0 -> 22255 bytes | |
| docs/images/manual/screenshots/source-flagged.png | Bin 0 -> 89359 bytes | |
| docs/images/manual/screenshots/source-generate.png | Bin 0 -> 58562 bytes | |
| docs/images/manual/screenshots/source-index.png | Bin 0 -> 55230 bytes | |
| docs/images/manual/screenshots/source-logout_flashed_message.png | Bin 0 -> 70548 bytes | |
| docs/images/manual/screenshots/source-lookup.png | Bin 0 -> 73894 bytes | |
| docs/images/manual/screenshots/source-submission_entered_text.png | Bin 0 -> 65154 bytes | |
| docs/images/manual/securedrop-security-slider-warning.png | Bin 0 -> 7387 bytes | |
| docs/images/manual/source-step1.png | Bin 93965 -> 0 bytes | |
| docs/images/manual/source-step10.png | Bin 80079 -> 0 bytes | |
| docs/images/manual/source-step11.png | Bin 188876 -> 0 bytes | |
| docs/images/manual/source-step2.png | Bin 97595 -> 0 bytes | |
| docs/images/manual/source-step3-and-step7.png | Bin 88434 -> 0 bytes | |
| docs/images/manual/source-step4.png | Bin 84904 -> 0 bytes | |
| docs/images/manual/source-step5.png | Bin 82058 -> 0 bytes | |
| docs/images/manual/source-step6.png | Bin 86617 -> 0 bytes | |
| docs/images/manual/source-step8.png | Bin 52694 -> 0 bytes | |
| docs/images/manual/source-step9.png | Bin 67309 -> 0 bytes | |
| docs/images/manual/source-turn-slider-to-high.png | Bin 0 -> 38996 bytes | |
| docs/images/manual/source1.png | Bin 131547 -> 0 bytes | |
| docs/images/manual/source10.png | Bin 104265 -> 0 bytes | |
| docs/images/manual/source11.png | Bin 99426 -> 0 bytes | |
| docs/images/manual/source2.png | Bin 127042 -> 0 bytes | |
| docs/images/manual/source3.png | Bin 112846 -> 0 bytes | |
| docs/images/manual/source4.png | Bin 121840 -> 0 bytes | |
| docs/images/manual/source5.png | Bin 101544 -> 0 bytes | |
| docs/images/manual/source6.png | Bin 102828 -> 0 bytes | |
| docs/images/manual/source7.png | Bin 112705 -> 0 bytes | |
| docs/images/manual/source8.png | Bin 98213 -> 0 bytes | |
| docs/images/manual/source9.png | Bin 104923 -> 0 bytes | |
| docs/images/manual/source_flagged_for_reply.png | Bin 106658 -> 0 bytes | |
| docs/images/manual/source_generate_codename.png | Bin 179401 -> 0 bytes | |
| docs/images/manual/source_landing_page_disable_javascript.png | Bin 203046 -> 0 bytes | |
| docs/images/manual/source_landing_page_no_warning.png | Bin 169172 -> 0 bytes | |
| docs/images/manual/source_landing_with_warning.png | Bin 180298 -> 0 bytes | |
| docs/images/manual/source_reply_deleted.png | Bin 163053 -> 0 bytes | |
| docs/images/manual/source_reply_from_journalist.png | Bin 188767 -> 0 bytes | |
| docs/images/manual/source_second_login.png | Bin 131228 -> 0 bytes | |
| docs/images/manual/source_submission_received.png | Bin 174941 -> 0 bytes | |
| docs/images/manual/source_upload_submission.png | Bin 170362 -> 0 bytes | |
| docs/images/manual/tbb_Document5.png | Bin 115391 -> 49930 bytes | |
| docs/images/manual/tbb_Document6.png | Bin 102510 -> 73165 bytes | |
| docs/images/manual/viewing1.jpg | Bin 152635 -> 0 bytes | |
| docs/images/manual/viewing2.jpg | Bin 138448 -> 0 bytes | |
| docs/images/manual/viewing3.jpg | Bin 145467 -> 0 bytes | |
| docs/images/manual/viewing4.jpg | Bin 166267 -> 0 bytes | |
| docs/images/manual/viewing5.jpg | Bin 145301 -> 0 bytes | |
| docs/images/manual/viewing6.jpg | Bin 221058 -> 0 bytes | |
| docs/images/manual/viewing7.jpg | Bin 196460 -> 0 bytes | |
| docs/images/manual/viewing8.jpg | Bin 190107 -> 0 bytes | |
| docs/images/weblate/admin-lock.png | Bin 0 -> 175841 bytes | |
| docs/images/weblate/admin-locked.png | Bin 0 -> 105143 bytes | |
| docs/images/weblate/admin-unlock.png | Bin 0 -> 184180 bytes | |
| docs/images/weblate/admin-unlocked.png | Bin 0 -> 76400 bytes | |
| docs/images/yubikey_oath_hotp_configuration.png | Bin 249632 -> 0 bytes | |
| docs/images/yubikey_oath_htop_configuration.png | Bin 0 -> 95401 bytes | |
| docs/images/yubikey_overview.png | Bin 0 -> 50818 bytes | |
| docs/includes/docs-branches.txt | 10 + | |
| docs/includes/otp-app.txt | 7 + | |
| docs/includes/rerun-install-is-safe.txt | 5 + | |
| docs/index.rst | 26 +- | |
| docs/install.rst | 63 +- | |
| docs/journalist.rst | 464 +- | |
| docs/network_firewall.rst | 34 +- | |
| docs/onboarding.rst | 12 +- | |
| docs/ossec_alerts.rst | 23 +- | |
| docs/overview.rst | 22 +- | |
| docs/passphrase_best_practices.rst | 67 +- | |
| docs/passphrases.rst | 23 +- | |
| docs/servers.rst | 56 +- | |
| docs/servers_2fa.rst | 31 + | |
| docs/set_up_admin_tails.rst | 6 +- | |
| docs/set_up_svs.rst | 33 + | |
| docs/set_up_tails.rst | 2 +- | |
| docs/source.rst | 107 +- | |
| docs/tails_guide.rst | 50 +- | |
| docs/terminology.rst | 16 +- | |
| docs/test_the_installation.rst | 8 +- | |
| docs/threat_model/dataflow.rst | 10 + | |
| docs/{development => threat_model}/threat_model.rst | 21 +- | |
| docs/training_schedule.rst | 8 +- | |
| docs/upgrade/0.4.x_to_0.5.rst | 77 + | |
| docs/upgrade_to_tails_3x.rst | 8 +- | |
| docs/what_makes_securedrop_unique.rst | 4 +- | |
| docs/yubikey_setup.rst | 187 +- | |
| git/pre-commit | 2 + | |
| install_files/ansible-base/action_plugins/synchronize.py | 415 - | |
| install_files/ansible-base/build-deb-pkgs.yml | 37 +- | |
| install_files/ansible-base/group_vars/all/securedrop | 17 +- | |
| install_files/ansible-base/group_vars/securedrop_application_server.yml | 3 +- | |
| install_files/ansible-base/group_vars/securedrop_monitor_server.yml | 3 +- | |
| install_files/ansible-base/prod-specific.yml | 4 - | |
| install_files/ansible-base/requirements.all | 21 - | |
| install_files/ansible-base/roles/app-test/tasks/main.yml | 2 + | |
| install_files/ansible-base/roles/app-test/tasks/modern_gettext.yml | 28 + | |
| install_files/ansible-base/roles/app-test/tasks/setup_firefox_for_selenium.yml | 1 - | |
| install_files/ansible-base/roles/app/defaults/main.yml | 18 +- | |
| install_files/ansible-base/roles/app/tasks/initialize_securedrop_app.yml | 28 +- | |
| install_files/ansible-base/roles/app/templates/sites-available/journalist.conf | 1 + | |
| install_files/ansible-base/roles/app/templates/sites-available/source.conf | 8 + | |
| install_files/ansible-base/roles/build-generic-pkg/files/build_generic_package.sh | 18 +- | |
| install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/defaults/main.yml | 2 +- | |
| .../ansible-base/roles/build-securedrop-app-code-deb-pkg/files/usr.sbin.apache2 | 49 +- | |
| .../roles/build-securedrop-app-code-deb-pkg/tasks/build_securedrop_app_code_deb.yml | 4 +- | |
| install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/tasks/sass.yml | 4 +- | |
| .../ansible-base/roles/build-securedrop-app-code-deb-pkg/tasks/translations.yml | 23 + | |
| install_files/ansible-base/roles/ci-tweaks/tasks/main.yml | 17 + | |
| install_files/ansible-base/roles/common/tasks/main.yml | 2 + | |
| install_files/ansible-base/roles/common/tasks/post_ubuntu_install_checks.yml | 51 + | |
| install_files/ansible-base/roles/common/tasks/setup_etc_hosts.yml | 1 - | |
| install_files/ansible-base/roles/common/templates/security.list | 2 +- | |
| install_files/ansible-base/roles/development/defaults/main.yml | 2 +- | |
| install_files/ansible-base/roles/development/tasks/main.yml | 2 +- | |
| install_files/ansible-base/roles/grsecurity/meta/main.yml | 5 - | |
| install_files/ansible-base/roles/grsecurity/tasks/apply_grsec_lock.yml | 2 +- | |
| install_files/ansible-base/roles/install-local-packages/tasks/install_debs.yml | 6 +- | |
| install_files/ansible-base/roles/ossec-agent/handlers/main.yml | 1 - | |
| install_files/ansible-base/roles/ossec-agent/tasks/agent_config.yml | 1 - | |
| install_files/ansible-base/roles/ossec-server/tasks/mon_configure_custom_cert.yml | 1 - | |
| install_files/ansible-base/roles/ossec-server/templates/send_encrypted_alarm.sh | 6 +- | |
| install_files/ansible-base/roles/restrict-direct-access/tasks/dh_moduli.yml | 38 +- | |
| install_files/ansible-base/roles/restrict-direct-access/tasks/fetch_tor_config.yml | 3 +- | |
| install_files/ansible-base/roles/restrict-direct-access/templates/sshd_config | 2 +- | |
| install_files/ansible-base/roles/tails-config/files/65-configure-tor-for-securedrop.sh | 4 +- | |
| install_files/ansible-base/roles/tails-config/files/securedrop_init.py | 28 +- | |
| install_files/ansible-base/roles/tails-config/tasks/configure_network_hook.yml | 1 - | |
| install_files/ansible-base/roles/tails-config/tasks/create_desktop_shortcuts.yml | 6 +- | |
| install_files/ansible-base/roles/tails-config/templates/ar.po | 28 + | |
| install_files/ansible-base/roles/tails-config/templates/de_DE.po | 27 + | |
| install_files/ansible-base/roles/tails-config/templates/desktop-journalist-icon.j2 | 19 + | |
| .../roles/tails-config/templates/{desktop-icon.j2 => desktop-journalist-icon.j2.in} | 4 +- | |
| install_files/ansible-base/roles/tails-config/templates/desktop-source-icon.j2 | 19 + | |
| install_files/ansible-base/roles/tails-config/templates/desktop-source-icon.j2.in | 10 + | |
| install_files/ansible-base/roles/tails-config/templates/desktop.pot | 25 + | |
| install_files/ansible-base/roles/tails-config/templates/es_ES.po | 27 + | |
| install_files/ansible-base/roles/tails-config/templates/fr.po | 28 + | |
| install_files/ansible-base/roles/tails-config/templates/it.po | 27 + | |
| install_files/ansible-base/roles/tails-config/templates/nb_NO.po | 28 + | |
| install_files/ansible-base/roles/tails-config/templates/nl.po | 27 + | |
| install_files/ansible-base/roles/tails-config/templates/pt_BR.po | 25 + | |
| install_files/ansible-base/roles/tails-config/templates/tr.po | 27 + | |
| install_files/ansible-base/roles/tails-config/templates/zh_Hant.po | 27 + | |
| install_files/ansible-base/roles/tor-hidden-services/tasks/install_tor.yml | 42 +- | |
| install_files/ansible-base/roles/upgrade/handlers/main.yml | 2 +- | |
| install_files/ansible-base/roles/upgrade/tasks/0-3pre-upgrade.yml | 14 +- | |
| install_files/ansible-base/roles/validate/files/validate-gpg-key.sh | 7 + | |
| install_files/ansible-base/roles/validate/files/validate-supported-locales.sh | 17 + | |
| install_files/ansible-base/roles/validate/tasks/main.yml | 2 + | |
| install_files/ansible-base/roles/validate/tasks/validate_ossec_info.yml | 52 - | |
| install_files/ansible-base/roles/validate/tasks/validate_supported_locales.yml | 4 + | |
| install_files/ansible-base/securedrop-configure.yml | 19 +- | |
| install_files/ansible-base/securedrop-development.yml | 14 +- | |
| install_files/ansible-base/securedrop-prod.yml | 23 +- | |
| install_files/ansible-base/securedrop-staging.yml | 26 +- | |
| install_files/ansible-base/tasks/reboot.yml | 2 +- | |
| install_files/ossec-server/DEBIAN/postrm | 4 +- | |
| install_files/securedrop-app-code/DEBIAN/control | 4 +- | |
| install_files/securedrop-app-code/DEBIAN/postinst | 15 +- | |
| install_files/securedrop-app-code/usr/share/doc/securedrop-app-code/changelog.Debian | 36 + | |
| install_files/securedrop-config/DEBIAN/control | 10 + | |
| install_files/securedrop-config/DEBIAN/postinst | 29 + | |
| install_files/securedrop-config/etc/apt/sources.list.d/tor.apt.freedom.press.list | 1 + | |
| install_files/securedrop-grsec/DEBIAN/control | 12 + | |
| install_files/securedrop-grsec/etc/kernel/postinst.d/paxctl-grub | 17 + | |
| install_files/securedrop-grsec/etc/sysctl.d/30-securedrop.conf | 1 + | |
| install_files/securedrop-keyring/DEBIAN/control | 2 +- | |
| install_files/securedrop-ossec-agent/DEBIAN/control | 4 +- | |
| install_files/securedrop-ossec-agent/var/ossec/etc/ossec.conf | 4 +- | |
| install_files/securedrop-ossec-server/DEBIAN/control | 4 +- | |
| install_files/securedrop-ossec-server/var/ossec/etc/ossec.conf | 3 +- | |
| install_files/securedrop-ossec-server/var/ossec/rules/local_rules.xml | 20 + | |
| install_files/securedrop-ossec-server/var/ossec/setup_gmail_test.sh | 60 - | |
| migration_scripts/0.2.1/0.2.1_collect.py | 97 - | |
| migration_scripts/0.2.1/0.3_migrate.py | 296 - | |
| migration_scripts/0.2.1/adjectives.txt | 14017 --------- | |
| migration_scripts/0.2.1/nouns.txt | 67749 ---------------------------------------- | |
| migration_scripts/0.2.1/old_crypto_util.py | 19 - | |
| migration_scripts/0.3pre/upgrade.sh | 138 - | |
| molecule/aws/aws-launch.yml | 84 + | |
| molecule/aws/create.yml | 103 + | |
| molecule/aws/destroy.yml | 27 + | |
| molecule/aws/molecule.yml | 48 + | |
| molecule/aws/playbook.yml | 1 + | |
| molecule/aws/reboot_and_wait.yml | 26 + | |
| {devops => molecule/aws}/scripts/app-tests.sh | 2 +- | |
| molecule/aws/scripts/ci-tester.sh | 23 + | |
| molecule/aws/side_effect.yml | 58 + | |
| molecule/aws/templates/ssh_config | 9 + | |
| {testinfra/functional => molecule/aws/tests}/test_tor_interfaces.py | 17 +- | |
| molecule/aws/tor.yml | 16 + | |
| molecule/builder/molecule.yml | 4 +- | |
| molecule/builder/tests/test_build_dependencies.py | 11 + | |
| molecule/builder/tests/test_securedrop_deb_package.py | 118 +- | |
| molecule/builder/tests/vars.yml | 11 +- | |
| securedrop-admin | 334 +- | |
| securedrop/.coveragerc | 2 +- | |
| securedrop/.dockerignore | 5 + | |
| securedrop/.rsync-filter | 21 + | |
| securedrop/.well-known/.gitignore | 1 + | |
| securedrop/Dockerfile | 56 + | |
| securedrop/Makefile | 77 + | |
| securedrop/babel.cfg | 6 + | |
| securedrop/bin/dev | 12 + | |
| securedrop/bin/test | 30 + | |
| securedrop/bin/update-user-guides | 21 + | |
| securedrop/codecov.yml | 2 + | |
| securedrop/config.py.example | 3 + | |
| securedrop/crypto_util.py | 44 +- | |
| securedrop/i18n.py | 168 + | |
| securedrop/journalist.py | 806 +- | |
| securedrop/journalist_app/__init__.py | 109 + | |
| securedrop/journalist_app/account.py | 69 + | |
| securedrop/journalist_app/admin.py | 243 + | |
| securedrop/journalist_app/col.py | 88 + | |
| securedrop/journalist_app/decorators.py | 19 + | |
| securedrop/journalist_app/forms.py | 63 + | |
| securedrop/journalist_app/main.py | 188 + | |
| securedrop/journalist_app/utils.py | 276 + | |
| securedrop/journalist_templates/_source_row.html | 14 +- | |
| securedrop/journalist_templates/account_edit_hotp_secret.html | 6 +- | |
| securedrop/journalist_templates/account_new_two_factor.html | 24 +- | |
| securedrop/journalist_templates/admin.html | 36 +- | |
| securedrop/journalist_templates/admin_add_user.html | 38 +- | |
| securedrop/journalist_templates/admin_edit_hotp_secret.html | 6 +- | |
| securedrop/journalist_templates/admin_new_user_two_factor.html | 26 +- | |
| securedrop/journalist_templates/base.html | 18 +- | |
| securedrop/journalist_templates/col.html | 60 +- | |
| securedrop/journalist_templates/config.html | 43 + | |
| securedrop/journalist_templates/delete.html | 6 +- | |
| securedrop/journalist_templates/edit_account.html | 70 +- | |
| securedrop/journalist_templates/flag.html | 6 +- | |
| securedrop/journalist_templates/index.html | 16 +- | |
| securedrop/journalist_templates/js-strings.html | 12 + | |
| securedrop/journalist_templates/locales.html | 28 + | |
| securedrop/journalist_templates/login.html | 14 +- | |
| securedrop/manage.py | 265 +- | |
| securedrop/pylintrc | 546 +- | |
| .../ansible-base/requirements.txt => securedrop/requirements/admin-requirements.txt | 2 +- | |
| install_files/ansible-base/requirements.in => securedrop/requirements/ansible.in | 0 | |
| securedrop/requirements/develop-requirements.in | 12 +- | |
| securedrop/requirements/develop-requirements.txt | 90 +- | |
| .../requirements/{securedrop-requirements.in => securedrop-app-code-requirements.in} | 2 +- | |
| securedrop/requirements/securedrop-app-code-requirements.txt | 31 + | |
| securedrop/requirements/securedrop-requirements.txt | 31 - | |
| securedrop/requirements/test-requirements.in | 2 - | |
| securedrop/requirements/test-requirements.txt | 30 +- | |
| securedrop/requirements/update_python_dependencies | 46 - | |
| securedrop/rm.py | 24 + | |
| securedrop/sass/_base.sass | 587 +- | |
| securedrop/sass/_source_index.sass | 5 +- | |
| securedrop/sass/_variables.sass | 5 + | |
| securedrop/sass/global/_body-tag.sass | 6 + | |
| securedrop/sass/global/_border-box-size-everything.sass | 5 + | |
| securedrop/sass/journalist.sass | 19 + | |
| securedrop/sass/{_font-awesome.sass => libraries/_font-awesome-iconography.sass} | 2 +- | |
| securedrop/sass/{ => libraries}/_normalize.sass | 2 +- | |
| securedrop/sass/modules/_aside.sass | 15 + | |
| securedrop/sass/modules/_banner-warning.sass | 9 + | |
| securedrop/sass/modules/_button-centering.sass | 4 + | |
| securedrop/sass/{_button-rules.sass => modules/_button.sass} | 11 +- | |
| securedrop/sass/modules/_center-text-align.sass | 3 + | |
| securedrop/sass/modules/_clearfix.sass | 3 + | |
| securedrop/sass/modules/_code.sass | 9 + | |
| securedrop/sass/modules/_codename-and-password.sass | 5 + | |
| securedrop/sass/modules/_cols.sass | 48 + | |
| securedrop/sass/modules/_confirm-prompt.sass | 6 + | |
| securedrop/sass/modules/_doc-check.sass | 3 + | |
| securedrop/sass/modules/_document-actions-button.sass | 4 + | |
| securedrop/sass/modules/_document-actions.sass | 7 + | |
| securedrop/sass/modules/_em-light-gray-emphasised-text.sass | 3 + | |
| securedrop/sass/modules/_flash.sass | 48 + | |
| securedrop/sass/modules/_footer.sass | 8 + | |
| securedrop/sass/modules/_form-validation-error.sass | 4 + | |
| securedrop/sass/modules/_grid-item.sass | 4 + | |
| securedrop/sass/modules/_header.sass | 14 + | |
| securedrop/sass/modules/_headline.sass | 23 + | |
| securedrop/sass/modules/_hr-horizontal-rule-line.sass | 11 + | |
| securedrop/sass/modules/_label.sass | 3 + | |
| securedrop/sass/modules/_link.sass | 9 + | |
| securedrop/sass/modules/_list-plain-and-starred.sass | 6 + | |
| securedrop/sass/modules/_logo.sass | 10 + | |
| securedrop/sass/modules/_logout.sass | 4 + | |
| securedrop/sass/modules/_main-content-area.sass | 5 + | |
| securedrop/sass/modules/_menu.sass | 67 + | |
| securedrop/sass/modules/_option.sass | 19 + | |
| securedrop/sass/modules/_panel.sass | 8 + | |
| securedrop/sass/modules/_pull.sass | 16 + | |
| securedrop/sass/modules/_qr-code-container.sass | 3 + | |
| securedrop/sass/modules/_regenerate-codename-button.sass | 14 + | |
| securedrop/sass/modules/_sd-button.sass | 7 + | |
| securedrop/sass/modules/_select-container.sass | 3 + | |
| securedrop/sass/modules/_select.sass | 11 + | |
| securedrop/sass/modules/_serious-text.sass | 4 + | |
| securedrop/sass/modules/_shared-secret.sass | 6 + | |
| securedrop/sass/modules/_snippet.sass | 45 + | |
| securedrop/sass/modules/_submission.sass | 23 + | |
| securedrop/sass/modules/_submissions.sass | 6 + | |
| securedrop/sass/modules/_text-link.sass | 3 + | |
| securedrop/sass/modules/_users-table.sass | 6 + | |
| securedrop/sass/modules/_visually-hidden.sass | 7 + | |
| securedrop/sass/modules/_warning.sass | 17 + | |
| securedrop/sass/source.sass | 69 +- | |
| securedrop/secure_tempfile.py | 6 +- | |
| securedrop/securedrop-admin | 334 + | |
| securedrop/source.py | 447 +- | |
| securedrop/source_app/__init__.py | 138 + | |
| securedrop/source_app/api.py | 20 + | |
| securedrop/source_app/decorators.py | 24 + | |
| securedrop/source_app/forms.py | 19 + | |
| securedrop/source_app/info.py | 30 + | |
| securedrop/source_app/main.py | 239 + | |
| securedrop/source_app/utils.py | 103 + | |
| securedrop/source_templates/base.html | 13 +- | |
| securedrop/source_templates/error.html | 6 +- | |
| securedrop/source_templates/first_submission_flashed_message.html | 8 +- | |
| securedrop/source_templates/generate.html | 27 +- | |
| securedrop/source_templates/index.html | 43 +- | |
| securedrop/source_templates/locales.html | 28 + | |
| securedrop/source_templates/login.html | 19 +- | |
| securedrop/source_templates/logout_flashed_message.html | 8 +- | |
| securedrop/source_templates/lookup.html | 70 +- | |
| securedrop/source_templates/next_submission_flashed_message.html | 2 +- | |
| securedrop/source_templates/notfound.html | 6 +- | |
| securedrop/source_templates/session_timeout.html | 8 + | |
| securedrop/source_templates/tor2web-warning.html | 8 +- | |
| securedrop/source_templates/use-tor-browser.html | 11 +- | |
| securedrop/source_templates/why-journalist-key.html | 26 +- | |
| securedrop/static/js/journalist.js | 43 +- | |
| securedrop/static/js/source.js | 4 +- | |
| securedrop/store.py | 26 +- | |
| securedrop/template_filters.py | 63 +- | |
| securedrop/tests/conftest.py | 10 + | |
| securedrop/tests/functional/functional_test.py | 35 +- | |
| securedrop/tests/functional/journalist_navigation_steps.py | 112 +- | |
| securedrop/tests/functional/make_account_changes.py | 6 +- | |
| securedrop/tests/functional/source_navigation_steps.py | 76 +- | |
| securedrop/tests/functional/test_admin_interface.py | 14 +- | |
| securedrop/tests/functional/test_journalist.py | 4 +- | |
| securedrop/tests/functional/test_source.py | 19 + | |
| securedrop/tests/functional/test_source_notfound.py | 4 +- | |
| securedrop/tests/functional/test_source_session_timeout.py | 25 + | |
| securedrop/tests/functional/test_source_warnings.py | 2 +- | |
| .../tests/functional/{submission_not_in_memory.py => test_submission_not_in_memory.py} | 22 +- | |
| securedrop/tests/functional/test_submit_and_retrieve_file.py | 4 +- | |
| securedrop/tests/functional/test_submit_and_retrieve_message.py | 4 +- | |
| securedrop/tests/i18n/code.py | 2 + | |
| securedrop/tests/i18n/journalist.desktop.in | 10 + | |
| securedrop/tests/i18n/source.desktop.in | 10 + | |
| securedrop/tests/pages-layout/functional_test.py | 12 +- | |
| securedrop/tests/pages-layout/test_journalist.py | 54 +- | |
| securedrop/tests/pages-layout/test_source.py | 77 +- | |
| securedrop/tests/test_2fa.py | 32 +- | |
| securedrop/tests/test_crypto_util.py | 23 +- | |
| securedrop/tests/test_i18n.py | 288 + | |
| securedrop/tests/test_integration.py | 23 +- | |
| securedrop/tests/test_journalist.py | 762 +- | |
| securedrop/tests/test_manage.py | 209 +- | |
| securedrop/tests/test_securedrop-admin.py | 79 + | |
| securedrop/tests/test_source.py | 448 +- | |
| securedrop/tests/test_store.py | 87 +- | |
| securedrop/tests/test_template_filters.py | 165 +- | |
| securedrop/tests/utils/async.py | 4 +- | |
| securedrop/tests/utils/db_helper.py | 38 +- | |
| securedrop/tests/utils/env.py | 11 +- | |
| securedrop/translations/ar/LC_MESSAGES/messages.po | 1347 + | |
| securedrop/translations/de_DE/LC_MESSAGES/messages.po | 1399 + | |
| securedrop/translations/es_ES/LC_MESSAGES/messages.po | 1394 + | |
| securedrop/translations/fr_FR/LC_MESSAGES/messages.po | 1401 + | |
| securedrop/translations/it_IT/LC_MESSAGES/messages.po | 1379 + | |
| securedrop/translations/messages.pot | 1172 + | |
| securedrop/translations/nb_NO/LC_MESSAGES/messages.po | 1358 + | |
| securedrop/translations/nl/LC_MESSAGES/messages.po | 1378 + | |
| securedrop/translations/pt_BR/LC_MESSAGES/messages.po | 1373 + | |
| securedrop/translations/tr/LC_MESSAGES/messages.po | 1367 + | |
| securedrop/translations/zh_Hant/LC_MESSAGES/messages.po | 1246 + | |
| securedrop/version.py | 2 +- | |
| securedrop/wordlist | 7604 +---- | |
| securedrop/wordlists/en.txt | 7603 +++++ | |
| securedrop/wordlists/fr.txt | 7384 +++++ | |
| testinfra/app/apache/test_apache_journalist_interface.py | 2 + | |
| testinfra/app/apache/test_apache_source_interface.py | 1 + | |
| testinfra/app/test_network.py | 3 +- | |
| testinfra/app/test_ossec.py | 8 +- | |
| testinfra/common/test_cron_apt.py | 2 +- | |
| testinfra/common/test_fpf_apt_repo.py | 28 +- | |
| testinfra/common/test_grsecurity.py | 2 + | |
| testinfra/common/test_ip6tables.py | 4 + | |
| testinfra/common/test_tor_config.py | 37 +- | |
| testinfra/common/test_tor_mirror.py | 76 + | |
| testinfra/common/test_user_config.py | 5 +- | |
| testinfra/development/test_development_application_settings.py | 5 - | |
| testinfra/development/test_development_environment.py | 16 +- | |
| testinfra/mon/test_network.py | 5 +- | |
| testinfra/mon/test_ossec.py | 6 +- | |
| testinfra/requirements.in | 2 + | |
| testinfra/requirements.txt | 74 - | |
| testinfra/test.py | 9 +- | |
| testinfra/vars/app-prod.yml | 6 +- | |
| testinfra/vars/app-staging.yml | 5 +- | |
| testinfra/vars/apptestclient.yml | 7 - | |
| testinfra/vars/mon-staging.yml | 14 + | |
| update_version.sh | 23 +- | |
| 522 files changed, 41201 insertions(+), 95919 deletions(-) | |
| create mode 100644 .github/CODEOWNERS | |
| create mode 100644 .mailmap | |
| create mode 100644 .yamllint | |
| create mode 100644 CONTRIBUTING.md | |
| delete mode 100644 devops/ansible_env | |
| create mode 100644 devops/docker/Dockerfile.linting | |
| delete mode 100644 devops/inventory/staging | |
| create mode 100644 devops/jenkins/TorNightlyPipeline | |
| delete mode 100755 devops/playbooks/aws-ci-startup.yml | |
| delete mode 100755 devops/playbooks/aws-ci-teardown.yml | |
| delete mode 100755 devops/playbooks/ci-app-tests.yml | |
| create mode 100644 devops/scripts/aws-jenkins-venv.sh | |
| delete mode 100755 devops/scripts/ci-build_only.sh | |
| delete mode 100755 devops/scripts/ci-runner.sh | |
| delete mode 100755 devops/scripts/ci-spinup.sh | |
| delete mode 100755 devops/scripts/ci-teardown.sh | |
| delete mode 100755 devops/scripts/ci-tester.sh | |
| delete mode 100755 devops/scripts/docs-detection | |
| create mode 100755 devops/scripts/rebase-develop.sh | |
| delete mode 100755 devops/scripts/spin-run-test.sh | |
| delete mode 100644 devops/templates/ssh_config | |
| delete mode 100644 devops/vars/staging.yml | |
| create mode 100644 docs/deployment/landing_page.rst | |
| create mode 100644 docs/deployment/minimum_security_requirements.rst | |
| create mode 100644 docs/deployment/sample_privacy_policy.rst | |
| create mode 100644 docs/deployment/whole_site_changes.rst | |
| create mode 100644 docs/development/setup_development.rst | |
| create mode 100644 docs/development/virtualizing_tails.rst | |
| create mode 100644 docs/diagrams/SecureDrop_DataFlow.draw | |
| create mode 100644 docs/diagrams/SecureDrop_DataFlow.png | |
| delete mode 100644 docs/google_authenticator.rst | |
| delete mode 100644 docs/images/admin_enter_verification.png | |
| delete mode 100644 docs/images/admin_main_home.png | |
| delete mode 100644 docs/images/admin_secondary_home.png | |
| create mode 100644 docs/images/devenv/tails-libvirt-boot-options.png | |
| create mode 100644 docs/images/devenv/tails-libvirt-filesystem-config.png | |
| create mode 100644 docs/images/labels/admin_workstation.xcf | |
| create mode 100644 docs/images/labels/app_server.xcf | |
| rename docs/images/labels/{sd_firewall.xcf => firewall.xcf} (59%) | |
| create mode 100644 docs/images/labels/journalist_workstation.xcf | |
| create mode 100644 docs/images/labels/mon_server.xcf | |
| delete mode 100644 docs/images/labels/sd_admin_workstation.xcf | |
| delete mode 100644 docs/images/labels/sd_app_server.xcf | |
| delete mode 100644 docs/images/labels/sd_journalist_workstation.xcf | |
| delete mode 100644 docs/images/labels/sd_mon_server.xcf | |
| rename docs/images/labels/{sd_secure_viewing_station_offline_warning.xcf => secure_viewing_station_offline_warning.xcf} (83%) | |
| delete mode 100644 docs/images/manual/document1.png | |
| delete mode 100644 docs/images/manual/document2.png | |
| delete mode 100644 docs/images/manual/document3.png | |
| delete mode 100644 docs/images/manual/document4.png | |
| delete mode 100644 docs/images/manual/document6.png | |
| delete mode 100644 docs/images/manual/document_flag_for_reply_button.png | |
| delete mode 100644 docs/images/manual/document_flagged_for_reply_notification.png | |
| delete mode 100644 docs/images/manual/journalist-admin_add_user_hotp.png | |
| delete mode 100644 docs/images/manual/journalist-admin_add_user_totp.png | |
| delete mode 100644 docs/images/manual/journalist-admin_new_user_two_factor_hotp.png | |
| delete mode 100644 docs/images/manual/journalist-admin_new_user_two_factor_totp.png | |
| delete mode 100644 docs/images/manual/logout-notification.png | |
| create mode 100644 docs/images/manual/screenshots/journalist-admin_add_user_hotp.png | |
| create mode 100644 docs/images/manual/screenshots/journalist-admin_add_user_totp.png | |
| create mode 100644 docs/images/manual/screenshots/journalist-admin_changes_logo_image.png | |
| create mode 100644 docs/images/manual/screenshots/journalist-admin_index_no_documents.png | |
| create mode 100644 docs/images/manual/screenshots/journalist-admin_interface_index.png | |
| create mode 100644 docs/images/manual/screenshots/journalist-admin_new_user_two_factor_hotp.png | |
| create mode 100644 docs/images/manual/screenshots/journalist-admin_new_user_two_factor_totp.png | |
| create mode 100644 docs/images/manual/screenshots/journalist-admin_ossec_alert_button.png | |
| create mode 100644 docs/images/manual/screenshots/journalist-admin_system_config_page.png | |
| create mode 100644 docs/images/manual/screenshots/journalist-clicks_on_source_and_selects_documents.png | |
| create mode 100644 docs/images/manual/screenshots/journalist-col_flagged.png | |
| create mode 100644 docs/images/manual/screenshots/journalist-col_has_no_key.png | |
| create mode 100644 docs/images/manual/screenshots/journalist-composes_reply.png | |
| create mode 100644 docs/images/manual/screenshots/journalist-index_javascript.png | |
| create mode 100644 docs/images/manual/screenshots/journalist-index_with_text.png | |
| create mode 100644 docs/images/manual/screenshots/source-checks_for_reply.png | |
| create mode 100644 docs/images/manual/screenshots/source-deletes_reply.png | |
| create mode 100644 docs/images/manual/screenshots/source-enter-codename-in-login.png | |
| create mode 100644 docs/images/manual/screenshots/source-flagged.png | |
| create mode 100644 docs/images/manual/screenshots/source-generate.png | |
| create mode 100644 docs/images/manual/screenshots/source-index.png | |
| create mode 100644 docs/images/manual/screenshots/source-logout_flashed_message.png | |
| create mode 100644 docs/images/manual/screenshots/source-lookup.png | |
| create mode 100644 docs/images/manual/screenshots/source-submission_entered_text.png | |
| create mode 100644 docs/images/manual/securedrop-security-slider-warning.png | |
| delete mode 100644 docs/images/manual/source-step1.png | |
| delete mode 100644 docs/images/manual/source-step10.png | |
| delete mode 100644 docs/images/manual/source-step11.png | |
| delete mode 100644 docs/images/manual/source-step2.png | |
| delete mode 100644 docs/images/manual/source-step3-and-step7.png | |
| delete mode 100644 docs/images/manual/source-step4.png | |
| delete mode 100644 docs/images/manual/source-step5.png | |
| delete mode 100644 docs/images/manual/source-step6.png | |
| delete mode 100644 docs/images/manual/source-step8.png | |
| delete mode 100644 docs/images/manual/source-step9.png | |
| create mode 100644 docs/images/manual/source-turn-slider-to-high.png | |
| delete mode 100644 docs/images/manual/source1.png | |
| delete mode 100644 docs/images/manual/source10.png | |
| delete mode 100644 docs/images/manual/source11.png | |
| delete mode 100644 docs/images/manual/source2.png | |
| delete mode 100644 docs/images/manual/source3.png | |
| delete mode 100644 docs/images/manual/source4.png | |
| delete mode 100644 docs/images/manual/source5.png | |
| delete mode 100644 docs/images/manual/source6.png | |
| delete mode 100644 docs/images/manual/source7.png | |
| delete mode 100644 docs/images/manual/source8.png | |
| delete mode 100644 docs/images/manual/source9.png | |
| delete mode 100644 docs/images/manual/source_flagged_for_reply.png | |
| delete mode 100644 docs/images/manual/source_generate_codename.png | |
| delete mode 100644 docs/images/manual/source_landing_page_disable_javascript.png | |
| delete mode 100644 docs/images/manual/source_landing_page_no_warning.png | |
| delete mode 100644 docs/images/manual/source_landing_with_warning.png | |
| delete mode 100644 docs/images/manual/source_reply_deleted.png | |
| delete mode 100644 docs/images/manual/source_reply_from_journalist.png | |
| delete mode 100644 docs/images/manual/source_second_login.png | |
| delete mode 100644 docs/images/manual/source_submission_received.png | |
| delete mode 100644 docs/images/manual/source_upload_submission.png | |
| delete mode 100644 docs/images/manual/viewing1.jpg | |
| delete mode 100644 docs/images/manual/viewing2.jpg | |
| delete mode 100644 docs/images/manual/viewing3.jpg | |
| delete mode 100644 docs/images/manual/viewing4.jpg | |
| delete mode 100644 docs/images/manual/viewing5.jpg | |
| delete mode 100644 docs/images/manual/viewing6.jpg | |
| delete mode 100644 docs/images/manual/viewing7.jpg | |
| delete mode 100644 docs/images/manual/viewing8.jpg | |
| create mode 100644 docs/images/weblate/admin-lock.png | |
| create mode 100644 docs/images/weblate/admin-locked.png | |
| create mode 100644 docs/images/weblate/admin-unlock.png | |
| create mode 100644 docs/images/weblate/admin-unlocked.png | |
| delete mode 100644 docs/images/yubikey_oath_hotp_configuration.png | |
| create mode 100644 docs/images/yubikey_oath_htop_configuration.png | |
| create mode 100644 docs/images/yubikey_overview.png | |
| create mode 100644 docs/includes/docs-branches.txt | |
| create mode 100644 docs/includes/otp-app.txt | |
| create mode 100644 docs/includes/rerun-install-is-safe.txt | |
| create mode 100644 docs/servers_2fa.rst | |
| create mode 100644 docs/threat_model/dataflow.rst | |
| rename docs/{development => threat_model}/threat_model.rst (97%) | |
| create mode 100644 docs/upgrade/0.4.x_to_0.5.rst | |
| delete mode 100644 install_files/ansible-base/action_plugins/synchronize.py | |
| delete mode 100644 install_files/ansible-base/requirements.all | |
| create mode 100644 install_files/ansible-base/roles/app-test/tasks/modern_gettext.yml | |
| create mode 100644 install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/tasks/translations.yml | |
| create mode 100644 install_files/ansible-base/roles/ci-tweaks/tasks/main.yml | |
| create mode 100644 install_files/ansible-base/roles/common/tasks/post_ubuntu_install_checks.yml | |
| delete mode 100644 install_files/ansible-base/roles/grsecurity/meta/main.yml | |
| create mode 100644 install_files/ansible-base/roles/tails-config/templates/ar.po | |
| create mode 100644 install_files/ansible-base/roles/tails-config/templates/de_DE.po | |
| create mode 100644 install_files/ansible-base/roles/tails-config/templates/desktop-journalist-icon.j2 | |
| rename install_files/ansible-base/roles/tails-config/templates/{desktop-icon.j2 => desktop-journalist-icon.j2.in} (64%) | |
| create mode 100644 install_files/ansible-base/roles/tails-config/templates/desktop-source-icon.j2 | |
| create mode 100644 install_files/ansible-base/roles/tails-config/templates/desktop-source-icon.j2.in | |
| create mode 100644 install_files/ansible-base/roles/tails-config/templates/desktop.pot | |
| create mode 100644 install_files/ansible-base/roles/tails-config/templates/es_ES.po | |
| create mode 100644 install_files/ansible-base/roles/tails-config/templates/fr.po | |
| create mode 100644 install_files/ansible-base/roles/tails-config/templates/it.po | |
| create mode 100644 install_files/ansible-base/roles/tails-config/templates/nb_NO.po | |
| create mode 100644 install_files/ansible-base/roles/tails-config/templates/nl.po | |
| create mode 100644 install_files/ansible-base/roles/tails-config/templates/pt_BR.po | |
| create mode 100644 install_files/ansible-base/roles/tails-config/templates/tr.po | |
| create mode 100644 install_files/ansible-base/roles/tails-config/templates/zh_Hant.po | |
| create mode 100755 install_files/ansible-base/roles/validate/files/validate-supported-locales.sh | |
| create mode 100644 install_files/ansible-base/roles/validate/tasks/validate_supported_locales.yml | |
| create mode 100644 install_files/securedrop-config/DEBIAN/control | |
| create mode 100755 install_files/securedrop-config/DEBIAN/postinst | |
| create mode 100644 install_files/securedrop-config/etc/apt/sources.list.d/tor.apt.freedom.press.list | |
| create mode 100644 install_files/securedrop-grsec/DEBIAN/control | |
| create mode 100755 install_files/securedrop-grsec/etc/kernel/postinst.d/paxctl-grub | |
| create mode 100644 install_files/securedrop-grsec/etc/sysctl.d/30-securedrop.conf | |
| delete mode 100755 install_files/securedrop-ossec-server/var/ossec/setup_gmail_test.sh | |
| delete mode 100755 migration_scripts/0.2.1/0.2.1_collect.py | |
| delete mode 100755 migration_scripts/0.2.1/0.3_migrate.py | |
| delete mode 100644 migration_scripts/0.2.1/adjectives.txt | |
| delete mode 100644 migration_scripts/0.2.1/nouns.txt | |
| delete mode 100644 migration_scripts/0.2.1/old_crypto_util.py | |
| delete mode 100755 migration_scripts/0.3pre/upgrade.sh | |
| create mode 100644 molecule/aws/aws-launch.yml | |
| create mode 100644 molecule/aws/create.yml | |
| create mode 100644 molecule/aws/destroy.yml | |
| create mode 100644 molecule/aws/molecule.yml | |
| create mode 120000 molecule/aws/playbook.yml | |
| create mode 100755 molecule/aws/reboot_and_wait.yml | |
| rename {devops => molecule/aws}/scripts/app-tests.sh (85%) | |
| create mode 100755 molecule/aws/scripts/ci-tester.sh | |
| create mode 100755 molecule/aws/side_effect.yml | |
| create mode 100644 molecule/aws/templates/ssh_config | |
| rename {testinfra/functional => molecule/aws/tests}/test_tor_interfaces.py (63%) | |
| create mode 100644 molecule/aws/tor.yml | |
| create mode 100644 securedrop/.dockerignore | |
| create mode 100644 securedrop/.well-known/.gitignore | |
| create mode 100644 securedrop/Dockerfile | |
| create mode 100644 securedrop/Makefile | |
| create mode 100755 securedrop/bin/dev | |
| create mode 100755 securedrop/bin/test | |
| create mode 100755 securedrop/bin/update-user-guides | |
| create mode 100644 securedrop/codecov.yml | |
| create mode 100644 securedrop/i18n.py | |
| create mode 100644 securedrop/journalist_app/__init__.py | |
| create mode 100644 securedrop/journalist_app/account.py | |
| create mode 100644 securedrop/journalist_app/admin.py | |
| create mode 100644 securedrop/journalist_app/col.py | |
| create mode 100644 securedrop/journalist_app/decorators.py | |
| create mode 100644 securedrop/journalist_app/forms.py | |
| create mode 100644 securedrop/journalist_app/main.py | |
| create mode 100644 securedrop/journalist_app/utils.py | |
| create mode 100644 securedrop/journalist_templates/config.html | |
| create mode 100644 securedrop/journalist_templates/js-strings.html | |
| create mode 100644 securedrop/journalist_templates/locales.html | |
| rename install_files/ansible-base/requirements.txt => securedrop/requirements/admin-requirements.txt (98%) | |
| rename install_files/ansible-base/requirements.in => securedrop/requirements/ansible.in (100%) | |
| rename securedrop/requirements/{securedrop-requirements.in => securedrop-app-code-requirements.in} (87%) | |
| create mode 100644 securedrop/requirements/securedrop-app-code-requirements.txt | |
| delete mode 100644 securedrop/requirements/securedrop-requirements.txt | |
| delete mode 100755 securedrop/requirements/update_python_dependencies | |
| create mode 100644 securedrop/rm.py | |
| create mode 100644 securedrop/sass/global/_body-tag.sass | |
| create mode 100644 securedrop/sass/global/_border-box-size-everything.sass | |
| rename securedrop/sass/{_font-awesome.sass => libraries/_font-awesome-iconography.sass} (99%) | |
| rename securedrop/sass/{ => libraries}/_normalize.sass (99%) | |
| create mode 100644 securedrop/sass/modules/_aside.sass | |
| create mode 100644 securedrop/sass/modules/_banner-warning.sass | |
| create mode 100644 securedrop/sass/modules/_button-centering.sass | |
| rename securedrop/sass/{_button-rules.sass => modules/_button.sass} (95%) | |
| create mode 100644 securedrop/sass/modules/_center-text-align.sass | |
| create mode 100644 securedrop/sass/modules/_clearfix.sass | |
| create mode 100644 securedrop/sass/modules/_code.sass | |
| create mode 100644 securedrop/sass/modules/_codename-and-password.sass | |
| create mode 100644 securedrop/sass/modules/_cols.sass | |
| create mode 100644 securedrop/sass/modules/_confirm-prompt.sass | |
| create mode 100644 securedrop/sass/modules/_doc-check.sass | |
| create mode 100644 securedrop/sass/modules/_document-actions-button.sass | |
| create mode 100644 securedrop/sass/modules/_document-actions.sass | |
| create mode 100644 securedrop/sass/modules/_em-light-gray-emphasised-text.sass | |
| create mode 100644 securedrop/sass/modules/_flash.sass | |
| create mode 100644 securedrop/sass/modules/_footer.sass | |
| create mode 100644 securedrop/sass/modules/_form-validation-error.sass | |
| create mode 100644 securedrop/sass/modules/_grid-item.sass | |
| create mode 100644 securedrop/sass/modules/_header.sass | |
| create mode 100644 securedrop/sass/modules/_headline.sass | |
| create mode 100644 securedrop/sass/modules/_hr-horizontal-rule-line.sass | |
| create mode 100644 securedrop/sass/modules/_label.sass | |
| create mode 100644 securedrop/sass/modules/_link.sass | |
| create mode 100644 securedrop/sass/modules/_list-plain-and-starred.sass | |
| create mode 100644 securedrop/sass/modules/_logo.sass | |
| create mode 100644 securedrop/sass/modules/_logout.sass | |
| create mode 100644 securedrop/sass/modules/_main-content-area.sass | |
| create mode 100644 securedrop/sass/modules/_menu.sass | |
| create mode 100644 securedrop/sass/modules/_option.sass | |
| create mode 100644 securedrop/sass/modules/_panel.sass | |
| create mode 100644 securedrop/sass/modules/_pull.sass | |
| create mode 100644 securedrop/sass/modules/_qr-code-container.sass | |
| create mode 100644 securedrop/sass/modules/_regenerate-codename-button.sass | |
| create mode 100644 securedrop/sass/modules/_sd-button.sass | |
| create mode 100644 securedrop/sass/modules/_select-container.sass | |
| create mode 100644 securedrop/sass/modules/_select.sass | |
| create mode 100644 securedrop/sass/modules/_serious-text.sass | |
| create mode 100644 securedrop/sass/modules/_shared-secret.sass | |
| create mode 100644 securedrop/sass/modules/_snippet.sass | |
| create mode 100644 securedrop/sass/modules/_submission.sass | |
| create mode 100644 securedrop/sass/modules/_submissions.sass | |
| create mode 100644 securedrop/sass/modules/_text-link.sass | |
| create mode 100644 securedrop/sass/modules/_users-table.sass | |
| create mode 100644 securedrop/sass/modules/_visually-hidden.sass | |
| create mode 100644 securedrop/sass/modules/_warning.sass | |
| create mode 100755 securedrop/securedrop-admin | |
| create mode 100644 securedrop/source_app/__init__.py | |
| create mode 100644 securedrop/source_app/api.py | |
| create mode 100644 securedrop/source_app/decorators.py | |
| create mode 100644 securedrop/source_app/forms.py | |
| create mode 100644 securedrop/source_app/info.py | |
| create mode 100644 securedrop/source_app/main.py | |
| create mode 100644 securedrop/source_app/utils.py | |
| create mode 100644 securedrop/source_templates/locales.html | |
| create mode 100644 securedrop/source_templates/session_timeout.html | |
| create mode 100644 securedrop/tests/functional/test_source.py | |
| create mode 100644 securedrop/tests/functional/test_source_session_timeout.py | |
| rename securedrop/tests/functional/{submission_not_in_memory.py => test_submission_not_in_memory.py} (83%) | |
| create mode 100644 securedrop/tests/i18n/journalist.desktop.in | |
| create mode 100644 securedrop/tests/i18n/source.desktop.in | |
| create mode 100644 securedrop/tests/test_i18n.py | |
| create mode 100644 securedrop/tests/test_securedrop-admin.py | |
| create mode 100644 securedrop/translations/ar/LC_MESSAGES/messages.po | |
| create mode 100644 securedrop/translations/de_DE/LC_MESSAGES/messages.po | |
| create mode 100644 securedrop/translations/es_ES/LC_MESSAGES/messages.po | |
| create mode 100644 securedrop/translations/fr_FR/LC_MESSAGES/messages.po | |
| create mode 100644 securedrop/translations/it_IT/LC_MESSAGES/messages.po | |
| create mode 100644 securedrop/translations/messages.pot | |
| create mode 100644 securedrop/translations/nb_NO/LC_MESSAGES/messages.po | |
| create mode 100644 securedrop/translations/nl/LC_MESSAGES/messages.po | |
| create mode 100644 securedrop/translations/pt_BR/LC_MESSAGES/messages.po | |
| create mode 100644 securedrop/translations/tr/LC_MESSAGES/messages.po | |
| create mode 100644 securedrop/translations/zh_Hant/LC_MESSAGES/messages.po | |
| mode change 100644 => 120000 securedrop/wordlist | |
| create mode 100644 securedrop/wordlists/en.txt | |
| create mode 100644 securedrop/wordlists/fr.txt | |
| create mode 100644 testinfra/common/test_tor_mirror.py | |
| delete mode 100644 testinfra/requirements.txt | |
| delete mode 100644 testinfra/vars/apptestclient.yml | |
| [conor@October:~/freedomofpress/securedrop] [sd] try-merging-0.5.1-into-master-again+* 2s ± | |
| $ | |
| [conor@October:~/freedomofpress/securedrop] [sd] try-merging-0.5.1-into-master-again+* ± | |
| $ git config | |
| usage: git config [<options>] | |
| Config file location | |
| --global use global config file | |
| --system use system config file | |
| --local use repository config file | |
| -f, --file <file> use given config file | |
| --blob <blob-id> read config from given blob object | |
| Action | |
| --get get value: name [value-regex] | |
| --get-all get all values: key [value-regex] | |
| --get-regexp get values for regexp: name-regex [value-regex] | |
| --get-urlmatch get value specific for the URL: section[.var] URL | |
| --replace-all replace all matching variables: name value [value_regex] | |
| --add add a new variable: name value | |
| --unset remove a variable: name [value-regex] | |
| --unset-all remove all matches: name [value-regex] | |
| --rename-section rename section: old-name new-name | |
| --remove-section remove a section: name | |
| -l, --list list all | |
| -e, --edit open an editor | |
| --get-color find the color configured: slot [default] | |
| --get-colorbool find the color setting: slot [stdout-is-tty] | |
| Type | |
| --bool value is "true" or "false" | |
| --int value is decimal number | |
| --bool-or-int value is --bool or --int | |
| --path value is a path (file or directory name) | |
| Other | |
| -z, --null terminate values with NUL byte | |
| --name-only show variable names only | |
| --includes respect include directives on lookup | |
| --show-origin show origin of config (file, standard input, blob, command line) | |
| [conor@October:~/freedomofpress/securedrop] [sd] try-merging-0.5.1-into-master-again+* 129 ± | |
| $ git config list | |
| error: key does not contain a section: list | |
| [conor@October:~/freedomofpress/securedrop] [sd] try-merging-0.5.1-into-master-again+* 1 ± | |
| $ git config -l | |
| filter.lfs.clean=git-lfs clean -- %f | |
| filter.lfs.smudge=git-lfs smudge -- %f | |
| filter.lfs.process=git-lfs filter-process | |
| filter.lfs.required=true | |
| status.submodulesummary=true | |
| core.excludesfile=~/.gitignore | |
| core.editor=vim | |
| pull.rebase=true | |
| receive.fsckobjects=true | |
| transfer.fsckobjects=true | |
| user.name=Conor Schaefer | |
| user.email=conor@freedom.press | |
| push.default=matching | |
| diff.submodule=log | |
| fetch.fsckobjects=true | |
| user.name=Conor Schaefer | |
| user.email=conor@freedom.press | |
| core.repositoryformatversion=0 | |
| core.filemode=true | |
| core.bare=false | |
| core.logallrefupdates=true | |
| remote.noah.url=https://github.com/fowlslegs/securedrop | |
| remote.noah.fetch=+refs/heads/*:refs/remotes/noah/* | |
| remote.conorsch.url=git@github.com:conorsch/securedrop | |
| remote.conorsch.fetch=+refs/heads/*:refs/remotes/conorsch/* | |
| remote.conorsch.fetch=+refs/heads/consolidate-build-roles-rebased:refs/remotes/conorsch/consolidate-build-roles-rebased | |
| remote.conorsch.fetch=+refs/heads/consolidate-build-roles-rebased:refs/remotes/conorsch/consolidate-build-roles-rebased | |
| branch.consolidate-build-roles-rebased.remote=conorsch | |
| branch.consolidate-build-roles-rebased.merge=refs/heads/consolidate-build-roles-rebased | |
| remote.harlo.url=https://github.com/harlo/securedrop | |
| remote.harlo.fetch=+refs/heads/*:refs/remotes/harlo/* | |
| branch.vagrantfile-fixes.remote=conorsch | |
| branch.vagrantfile-fixes.merge=refs/heads/vagrantfile-fixes | |
| branch.conorsch-consolidate-build-roles-rebased.remote=conorsch | |
| branch.conorsch-consolidate-build-roles-rebased.merge=refs/heads/consolidate-build-roles-rebased | |
| remote.redshiftzero.url=git://github.com/redshiftzero/securedrop.git | |
| remote.redshiftzero.fetch=+refs/heads/custom-notification:refs/remotes/redshiftzero/custom-notification | |
| remote.redshiftzero.fetch=+refs/heads/dev-diagram:refs/remotes/redshiftzero/dev-diagram | |
| branch.redshiftzero-custom-notification.remote=redshiftzero | |
| branch.redshiftzero-custom-notification.merge=refs/heads/custom-notification | |
| branch.redshiftzero-dev-diagram.remote=redshiftzero | |
| branch.redshiftzero-dev-diagram.merge=refs/heads/dev-diagram | |
| remote.commandnotfound.url=git://github.com/commandnotfound/securedrop.git | |
| remote.commandnotfound.fetch=+refs/heads/effwordlist:refs/remotes/commandnotfound/effwordlist | |
| branch.commandnotfound-effwordlist.remote=commandnotfound | |
| branch.commandnotfound-effwordlist.merge=refs/heads/effwordlist | |
| remote.heartsucker.url=git://github.com/heartsucker/securedrop.git | |
| remote.heartsucker.fetch=+refs/heads/source-ux:refs/remotes/heartsucker/source-ux | |
| remote.heartsucker.fetch=+refs/heads/session-timeouts:refs/remotes/heartsucker/session-timeouts | |
| branch.heartsucker-source-ux.remote=heartsucker | |
| branch.heartsucker-source-ux.merge=refs/heads/source-ux | |
| remote.freddymartinez9.url=git://github.com/freddymartinez9/securedrop.git | |
| remote.freddymartinez9.fetch=+refs/heads/imagecleanup:refs/remotes/freddymartinez9/imagecleanup | |
| remote.freddymartinez9.fetch=+refs/heads/newossecalarmdocs:refs/remotes/freddymartinez9/newossecalarmdocs | |
| branch.freddymartinez9-imagecleanup.remote=freddymartinez9 | |
| branch.freddymartinez9-imagecleanup.merge=refs/heads/imagecleanup | |
| branch.freddymartinez9-newossecalarmdocs.remote=freddymartinez9 | |
| branch.freddymartinez9-newossecalarmdocs.merge=refs/heads/newossecalarmdocs | |
| remote.KwadroNaut.url=git://github.com/KwadroNaut/securedrop.git | |
| remote.KwadroNaut.fetch=+refs/heads/patch-5:refs/remotes/KwadroNaut/patch-5 | |
| remote.KwadroNaut.fetch=+refs/heads/patch-5:refs/remotes/KwadroNaut/patch-5 | |
| branch.KwadroNaut-patch-5.remote=KwadroNaut | |
| branch.KwadroNaut-patch-5.merge=refs/heads/patch-5 | |
| remote.msheiny.url=git://github.com/msheiny/securedrop.git | |
| remote.msheiny.fetch=+refs/heads/TestInfraTravis:refs/remotes/msheiny/TestInfraTravis | |
| remote.msheiny.tagopt=--no-tags | |
| branch.msheiny-TestInfraTravis.remote=msheiny | |
| branch.msheiny-TestInfraTravis.merge=refs/heads/TestInfraTravis | |
| remote.freedomofpress.url=git://github.com/freedomofpress/securedrop.git | |
| remote.freedomofpress.fetch=+refs/heads/improve-unit-testing-from-manage-py:refs/remotes/freedomofpress/improve-unit-testing-from-manage-py | |
| remote.freedomofpress.tagopt=--no-tags | |
| branch.freedomofpress-improve-unit-testing-from-manage-py.remote=freedomofpress | |
| branch.freedomofpress-improve-unit-testing-from-manage-py.merge=refs/heads/improve-unit-testing-from-manage-py | |
| remote.dachary.url=git://github.com/dachary/securedrop.git | |
| remote.dachary.fetch=+refs/heads/wip-ansible-redundant-handler:refs/remotes/dachary/wip-ansible-redundant-handler | |
| remote.dachary.tagopt=--no-tags | |
| branch.dachary-wip-ansible-redundant-handler.remote=dachary | |
| branch.dachary-wip-ansible-redundant-handler.merge=refs/heads/wip-ansible-redundant-handler | |
| branch.cleanup-travis-cauldron-of-guesses.remote=conorsch | |
| branch.cleanup-travis-cauldron-of-guesses.merge=refs/heads/cleanup-travis-cauldron-of-guesses | |
| branch.heartsucker-session-timeouts.remote=heartsucker | |
| branch.heartsucker-session-timeouts.merge=refs/heads/session-timeouts | |
| remote.origin.url=git@github.com:freedomofpress/securedrop | |
| remote.origin.fetch=+refs/heads/*:refs/remotes/origin/* | |
| branch.TorAptRepoMirror.remote=origin | |
| branch.TorAptRepoMirror.merge=refs/heads/TorAptRepoMirror | |
| branch.allow-symlinks-vagrantfile.remote=origin | |
| branch.allow-symlinks-vagrantfile.merge=refs/heads/allow-symlinks-vagrantfile | |
| branch.docs-sample-privacy-policy.remote=origin | |
| branch.docs-sample-privacy-policy.merge=refs/heads/docs-sample-privacy-policy | |
| remote.t2d.url=git://github.com/t2d/securedrop.git | |
| remote.t2d.fetch=+refs/heads/lintian:refs/remotes/t2d/lintian | |
| remote.t2d.tagopt=--no-tags | |
| branch.t2d-lintian.remote=t2d | |
| branch.t2d-lintian.merge=refs/heads/lintian | |
| remote.pierwill.url=git://github.com/pierwill/securedrop.git | |
| remote.pierwill.fetch=+refs/heads/docs-yubikey:refs/remotes/pierwill/docs-yubikey | |
| remote.pierwill.tagopt=--no-tags | |
| branch.pierwill-docs-yubikey.remote=pierwill | |
| branch.pierwill-docs-yubikey.merge=refs/heads/docs-yubikey | |
| branch.pierwill-docs-journalist-guide-revisions.remote=origin | |
| branch.pierwill-docs-journalist-guide-revisions.merge=refs/heads/pierwill-docs-journalist-guide-revisions | |
| branch.data_flow_diagram.remote=origin | |
| branch.data_flow_diagram.merge=refs/heads/data_flow_diagram | |
| branch.ExtendTorURL.remote=origin | |
| branch.ExtendTorURL.merge=refs/heads/ExtendTorURL | |
| branch.wip-dachary-2516-i18n-sdconfig.remote=origin | |
| branch.wip-dachary-2516-i18n-sdconfig.merge=refs/heads/wip-dachary-2516-i18n-sdconfig | |
| branch.HTTPSValidation.remote=origin | |
| branch.HTTPSValidation.merge=refs/heads/HTTPSValidation | |
| branch.fix-securedrop-admin-no-dnsutils.remote=origin | |
| branch.fix-securedrop-admin-no-dnsutils.merge=refs/heads/fix-securedrop-admin-no-dnsutils | |
| branch.release/0.5.remote=origin | |
| branch.release/0.5.merge=refs/heads/release/0.5 | |
| branch.wip-dachary-0.5-remove-unecessary-gettext.remote=origin | |
| branch.wip-dachary-0.5-remove-unecessary-gettext.merge=refs/heads/wip-dachary-0.5-remove-unecessary-gettext | |
| branch.wip-dachary-doc-sign-commit.remote=origin | |
| branch.wip-dachary-doc-sign-commit.merge=refs/heads/wip-dachary-doc-sign-commit | |
| branch.wip-dachary-docs-source.remote=origin | |
| branch.wip-dachary-docs-source.merge=refs/heads/wip-dachary-docs-source | |
| branch.fix-sshd-config.remote=origin | |
| branch.fix-sshd-config.merge=refs/heads/fix-sshd-config | |
| branch.OSSEC-Fix.remote=origin | |
| branch.OSSEC-Fix.merge=refs/heads/OSSEC-Fix | |
| branch.build_deb_pkgs_remove_unused_code.remote=origin | |
| branch.build_deb_pkgs_remove_unused_code.merge=refs/heads/build_deb_pkgs_remove_unused_code | |
| branch.GrsecUpTop.remote=origin | |
| branch.GrsecUpTop.merge=refs/heads/GrsecUpTop | |
| remote.ageis.url=git://github.com/ageis/securedrop.git | |
| remote.ageis.fetch=+refs/heads/no-referrer:refs/remotes/ageis/no-referrer | |
| remote.ageis.tagopt=--no-tags | |
| branch.ageis-no-referrer.remote=ageis | |
| branch.ageis-no-referrer.merge=refs/heads/no-referrer | |
| remote.ageis-ssh.url=git@github.com:ageis/securedrop | |
| remote.ageis-ssh.fetch=+refs/heads/*:refs/remotes/ageis-ssh/* | |
| branch.more-useful-output-sdadmin.remote=origin | |
| branch.more-useful-output-sdadmin.merge=refs/heads/more-useful-output-sdadmin | |
| branch.byebye-travis-ci.remote=origin | |
| branch.byebye-travis-ci.merge=refs/heads/byebye-travis-ci | |
| branch.stopgap-validate-smtp-host.remote=origin | |
| branch.stopgap-validate-smtp-host.merge=refs/heads/stopgap-validate-smtp-host | |
| branch.release/0.5.1.remote=origin | |
| branch.release/0.5.1.merge=refs/heads/release/0.5.1 | |
| branch.fix-autoversion-0.5.1.remote=origin | |
| branch.fix-autoversion-0.5.1.merge=refs/heads/fix-autoversion-0.5.1 | |
| [conor@October:~/freedomofpress/securedrop] [sd] try-merging-0.5.1-into-master-again+* ± | |
| $ git config -l | sort | |
| branch.ageis-no-referrer.merge=refs/heads/no-referrer | |
| branch.ageis-no-referrer.remote=ageis | |
| branch.allow-symlinks-vagrantfile.merge=refs/heads/allow-symlinks-vagrantfile | |
| branch.allow-symlinks-vagrantfile.remote=origin | |
| branch.build_deb_pkgs_remove_unused_code.merge=refs/heads/build_deb_pkgs_remove_unused_code | |
| branch.build_deb_pkgs_remove_unused_code.remote=origin | |
| branch.byebye-travis-ci.merge=refs/heads/byebye-travis-ci | |
| branch.byebye-travis-ci.remote=origin | |
| branch.cleanup-travis-cauldron-of-guesses.merge=refs/heads/cleanup-travis-cauldron-of-guesses | |
| branch.cleanup-travis-cauldron-of-guesses.remote=conorsch | |
| branch.commandnotfound-effwordlist.merge=refs/heads/effwordlist | |
| branch.commandnotfound-effwordlist.remote=commandnotfound | |
| branch.conorsch-consolidate-build-roles-rebased.merge=refs/heads/consolidate-build-roles-rebased | |
| branch.conorsch-consolidate-build-roles-rebased.remote=conorsch | |
| branch.consolidate-build-roles-rebased.merge=refs/heads/consolidate-build-roles-rebased | |
| branch.consolidate-build-roles-rebased.remote=conorsch | |
| branch.dachary-wip-ansible-redundant-handler.merge=refs/heads/wip-ansible-redundant-handler | |
| branch.dachary-wip-ansible-redundant-handler.remote=dachary | |
| branch.data_flow_diagram.merge=refs/heads/data_flow_diagram | |
| branch.data_flow_diagram.remote=origin | |
| branch.docs-sample-privacy-policy.merge=refs/heads/docs-sample-privacy-policy | |
| branch.docs-sample-privacy-policy.remote=origin | |
| branch.ExtendTorURL.merge=refs/heads/ExtendTorURL | |
| branch.ExtendTorURL.remote=origin | |
| branch.fix-autoversion-0.5.1.merge=refs/heads/fix-autoversion-0.5.1 | |
| branch.fix-autoversion-0.5.1.remote=origin | |
| branch.fix-securedrop-admin-no-dnsutils.merge=refs/heads/fix-securedrop-admin-no-dnsutils | |
| branch.fix-securedrop-admin-no-dnsutils.remote=origin | |
| branch.fix-sshd-config.merge=refs/heads/fix-sshd-config | |
| branch.fix-sshd-config.remote=origin | |
| branch.freddymartinez9-imagecleanup.merge=refs/heads/imagecleanup | |
| branch.freddymartinez9-imagecleanup.remote=freddymartinez9 | |
| branch.freddymartinez9-newossecalarmdocs.merge=refs/heads/newossecalarmdocs | |
| branch.freddymartinez9-newossecalarmdocs.remote=freddymartinez9 | |
| branch.freedomofpress-improve-unit-testing-from-manage-py.merge=refs/heads/improve-unit-testing-from-manage-py | |
| branch.freedomofpress-improve-unit-testing-from-manage-py.remote=freedomofpress | |
| branch.GrsecUpTop.merge=refs/heads/GrsecUpTop | |
| branch.GrsecUpTop.remote=origin | |
| branch.heartsucker-session-timeouts.merge=refs/heads/session-timeouts | |
| branch.heartsucker-session-timeouts.remote=heartsucker | |
| branch.heartsucker-source-ux.merge=refs/heads/source-ux | |
| branch.heartsucker-source-ux.remote=heartsucker | |
| branch.HTTPSValidation.merge=refs/heads/HTTPSValidation | |
| branch.HTTPSValidation.remote=origin | |
| branch.KwadroNaut-patch-5.merge=refs/heads/patch-5 | |
| branch.KwadroNaut-patch-5.remote=KwadroNaut | |
| branch.more-useful-output-sdadmin.merge=refs/heads/more-useful-output-sdadmin | |
| branch.more-useful-output-sdadmin.remote=origin | |
| branch.msheiny-TestInfraTravis.merge=refs/heads/TestInfraTravis | |
| branch.msheiny-TestInfraTravis.remote=msheiny | |
| branch.OSSEC-Fix.merge=refs/heads/OSSEC-Fix | |
| branch.OSSEC-Fix.remote=origin | |
| branch.pierwill-docs-journalist-guide-revisions.merge=refs/heads/pierwill-docs-journalist-guide-revisions | |
| branch.pierwill-docs-journalist-guide-revisions.remote=origin | |
| branch.pierwill-docs-yubikey.merge=refs/heads/docs-yubikey | |
| branch.pierwill-docs-yubikey.remote=pierwill | |
| branch.redshiftzero-custom-notification.merge=refs/heads/custom-notification | |
| branch.redshiftzero-custom-notification.remote=redshiftzero | |
| branch.redshiftzero-dev-diagram.merge=refs/heads/dev-diagram | |
| branch.redshiftzero-dev-diagram.remote=redshiftzero | |
| branch.release/0.5.1.merge=refs/heads/release/0.5.1 | |
| branch.release/0.5.1.remote=origin | |
| branch.release/0.5.merge=refs/heads/release/0.5 | |
| branch.release/0.5.remote=origin | |
| branch.stopgap-validate-smtp-host.merge=refs/heads/stopgap-validate-smtp-host | |
| branch.stopgap-validate-smtp-host.remote=origin | |
| branch.t2d-lintian.merge=refs/heads/lintian | |
| branch.t2d-lintian.remote=t2d | |
| branch.TorAptRepoMirror.merge=refs/heads/TorAptRepoMirror | |
| branch.TorAptRepoMirror.remote=origin | |
| branch.vagrantfile-fixes.merge=refs/heads/vagrantfile-fixes | |
| branch.vagrantfile-fixes.remote=conorsch | |
| branch.wip-dachary-0.5-remove-unecessary-gettext.merge=refs/heads/wip-dachary-0.5-remove-unecessary-gettext | |
| branch.wip-dachary-0.5-remove-unecessary-gettext.remote=origin | |
| branch.wip-dachary-2516-i18n-sdconfig.merge=refs/heads/wip-dachary-2516-i18n-sdconfig | |
| branch.wip-dachary-2516-i18n-sdconfig.remote=origin | |
| branch.wip-dachary-doc-sign-commit.merge=refs/heads/wip-dachary-doc-sign-commit | |
| branch.wip-dachary-doc-sign-commit.remote=origin | |
| branch.wip-dachary-docs-source.merge=refs/heads/wip-dachary-docs-source | |
| branch.wip-dachary-docs-source.remote=origin | |
| core.bare=false | |
| core.editor=vim | |
| core.excludesfile=~/.gitignore | |
| core.filemode=true | |
| core.logallrefupdates=true | |
| core.repositoryformatversion=0 | |
| diff.submodule=log | |
| fetch.fsckobjects=true | |
| filter.lfs.clean=git-lfs clean -- %f | |
| filter.lfs.process=git-lfs filter-process | |
| filter.lfs.required=true | |
| filter.lfs.smudge=git-lfs smudge -- %f | |
| pull.rebase=true | |
| push.default=matching | |
| receive.fsckobjects=true | |
| remote.ageis.fetch=+refs/heads/no-referrer:refs/remotes/ageis/no-referrer | |
| remote.ageis-ssh.fetch=+refs/heads/*:refs/remotes/ageis-ssh/* | |
| remote.ageis-ssh.url=git@github.com:ageis/securedrop | |
| remote.ageis.tagopt=--no-tags | |
| remote.ageis.url=git://github.com/ageis/securedrop.git | |
| remote.commandnotfound.fetch=+refs/heads/effwordlist:refs/remotes/commandnotfound/effwordlist | |
| remote.commandnotfound.url=git://github.com/commandnotfound/securedrop.git | |
| remote.conorsch.fetch=+refs/heads/consolidate-build-roles-rebased:refs/remotes/conorsch/consolidate-build-roles-rebased | |
| remote.conorsch.fetch=+refs/heads/consolidate-build-roles-rebased:refs/remotes/conorsch/consolidate-build-roles-rebased | |
| remote.conorsch.fetch=+refs/heads/*:refs/remotes/conorsch/* | |
| remote.conorsch.url=git@github.com:conorsch/securedrop | |
| remote.dachary.fetch=+refs/heads/wip-ansible-redundant-handler:refs/remotes/dachary/wip-ansible-redundant-handler | |
| remote.dachary.tagopt=--no-tags | |
| remote.dachary.url=git://github.com/dachary/securedrop.git | |
| remote.freddymartinez9.fetch=+refs/heads/imagecleanup:refs/remotes/freddymartinez9/imagecleanup | |
| remote.freddymartinez9.fetch=+refs/heads/newossecalarmdocs:refs/remotes/freddymartinez9/newossecalarmdocs | |
| remote.freddymartinez9.url=git://github.com/freddymartinez9/securedrop.git | |
| remote.freedomofpress.fetch=+refs/heads/improve-unit-testing-from-manage-py:refs/remotes/freedomofpress/improve-unit-testing-from-manage-py | |
| remote.freedomofpress.tagopt=--no-tags | |
| remote.freedomofpress.url=git://github.com/freedomofpress/securedrop.git | |
| remote.harlo.fetch=+refs/heads/*:refs/remotes/harlo/* | |
| remote.harlo.url=https://github.com/harlo/securedrop | |
| remote.heartsucker.fetch=+refs/heads/session-timeouts:refs/remotes/heartsucker/session-timeouts | |
| remote.heartsucker.fetch=+refs/heads/source-ux:refs/remotes/heartsucker/source-ux | |
| remote.heartsucker.url=git://github.com/heartsucker/securedrop.git | |
| remote.KwadroNaut.fetch=+refs/heads/patch-5:refs/remotes/KwadroNaut/patch-5 | |
| remote.KwadroNaut.fetch=+refs/heads/patch-5:refs/remotes/KwadroNaut/patch-5 | |
| remote.KwadroNaut.url=git://github.com/KwadroNaut/securedrop.git | |
| remote.msheiny.fetch=+refs/heads/TestInfraTravis:refs/remotes/msheiny/TestInfraTravis | |
| remote.msheiny.tagopt=--no-tags | |
| remote.msheiny.url=git://github.com/msheiny/securedrop.git | |
| remote.noah.fetch=+refs/heads/*:refs/remotes/noah/* | |
| remote.noah.url=https://github.com/fowlslegs/securedrop | |
| remote.origin.fetch=+refs/heads/*:refs/remotes/origin/* | |
| remote.origin.url=git@github.com:freedomofpress/securedrop | |
| remote.pierwill.fetch=+refs/heads/docs-yubikey:refs/remotes/pierwill/docs-yubikey | |
| remote.pierwill.tagopt=--no-tags | |
| remote.pierwill.url=git://github.com/pierwill/securedrop.git | |
| remote.redshiftzero.fetch=+refs/heads/custom-notification:refs/remotes/redshiftzero/custom-notification | |
| remote.redshiftzero.fetch=+refs/heads/dev-diagram:refs/remotes/redshiftzero/dev-diagram | |
| remote.redshiftzero.url=git://github.com/redshiftzero/securedrop.git | |
| remote.t2d.fetch=+refs/heads/lintian:refs/remotes/t2d/lintian | |
| remote.t2d.tagopt=--no-tags | |
| remote.t2d.url=git://github.com/t2d/securedrop.git | |
| status.submodulesummary=true | |
| transfer.fsckobjects=true | |
| user.email=conor@freedom.press | |
| user.email=conor@freedom.press | |
| user.name=Conor Schaefer | |
| user.name=Conor Schaefer | |
| [conor@October:~/freedomofpress/securedrop] [sd] try-merging-0.5.1-into-master-again+* ± | |
| $ git config -l | grep -i rebase | sort | |
| branch.conorsch-consolidate-build-roles-rebased.merge=refs/heads/consolidate-build-roles-rebased | |
| branch.conorsch-consolidate-build-roles-rebased.remote=conorsch | |
| branch.consolidate-build-roles-rebased.merge=refs/heads/consolidate-build-roles-rebased | |
| branch.consolidate-build-roles-rebased.remote=conorsch | |
| pull.rebase=true | |
| remote.conorsch.fetch=+refs/heads/consolidate-build-roles-rebased:refs/remotes/conorsch/consolidate-build-roles-rebased | |
| remote.conorsch.fetch=+refs/heads/consolidate-build-roles-rebased:refs/remotes/conorsch/consolidate-build-roles-rebased | |
| [conor@October:~/freedomofpress/securedrop] [sd] try-merging-0.5.1-into-master-again+* ± | |
| $ git config -l pull.rebase | |
| error: wrong number of arguments | |
| usage: git config [<options>] | |
| Config file location | |
| --global use global config file | |
| --system use system config file | |
| --local use repository config file | |
| -f, --file <file> use given config file | |
| --blob <blob-id> read config from given blob object | |
| Action | |
| --get get value: name [value-regex] | |
| --get-all get all values: key [value-regex] | |
| --get-regexp get values for regexp: name-regex [value-regex] | |
| --get-urlmatch get value specific for the URL: section[.var] URL | |
| --replace-all replace all matching variables: name value [value_regex] | |
| --add add a new variable: name value | |
| --unset remove a variable: name [value-regex] | |
| --unset-all remove all matches: name [value-regex] | |
| --rename-section rename section: old-name new-name | |
| --remove-section remove a section: name | |
| -l, --list list all | |
| -e, --edit open an editor | |
| --get-color find the color configured: slot [default] | |
| --get-colorbool find the color setting: slot [stdout-is-tty] | |
| Type | |
| --bool value is "true" or "false" | |
| --int value is decimal number | |
| --bool-or-int value is --bool or --int | |
| --path value is a path (file or directory name) | |
| Other | |
| -z, --null terminate values with NUL byte | |
| --name-only show variable names only | |
| --includes respect include directives on lookup | |
| --show-origin show origin of config (file, standard input, blob, command line) | |
| [conor@October:~/freedomofpress/securedrop] [sd] try-merging-0.5.1-into-master-again+* 129 ± | |
| $ git config --get pull.rebase | |
| true |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment