From 73d23b2e56e38445dff15e99952cbfb9349cd3d8 Mon Sep 17 00:00:00 2001 From: Kevin O'Gorman Date: Tue, 15 Mar 2022 11:55:53 -0400 Subject: [PATCH 1/4] SecureDrop 2.3.0-rc1 (cherry picked from commit 79cf63ee5b9657d8fcbaed83cfc98caa65170321) --- changelog.md | 24 +++++++++++++++++++ .../files/changelog-focal | 4 ++-- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/changelog.md b/changelog.md index 135f47a7e8..0999fb5ee7 100644 --- a/changelog.md +++ b/changelog.md @@ -2,6 +2,30 @@ ## 2.3.0~rc1 +### Web Applications + +* Added optional message filtering to allow instances to set a minimum initial message length and block initial messages containing source codenames (#6306, #6340) +* Added "skip to notification" link to allow screen-readers to navigate to flashed messages (#6336) +* Updated /generate to improve and simplify instructions on use of the codename (#6330) +* Fixed untranslated string in Read Replies widget (#6321) +* Updated Source Interface browser security level widget to reflect current Tor Browser UI (#6320) +* Added ARIA annotations for forms in Journalist Interface (#6240) +* Added tor2web detection via URL mangling (#6304) +* Removed unused bulk delete confirmation functionality (#6261) +* Added "skip to main content link" Source Interface base template (#6237) +* Added hidden antispam field to detect some automated submissions (#6302) +* Updated application to redirect to a warning page on detection of a tor2web proxy (#6300, #6335) +* Added Javascript check to detect use of non-torified proxy servers (#6303) +* Added /robots.txt route and meta tags to disallow bots on the Source Interface (#6299) +* Fixed text overflow issue in the "Read Replies" widget (#6301) +* Updated data attributes in the codename widget to be translateable strings (#6288) + +### Development + +* Added support for future user-agent strings with a 3-digit Firefox version (#6309) +* Updated `make shellcheck` to optionally use podman instead of Docker (#6239) +* Updated `make dev-tor` to set correct v3 address in Source Interface /metadata endpoint (#6308) + ## 2.2.1 * Update default grsec kernel version to 5.15.26 (#6325) diff --git a/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/changelog-focal b/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/changelog-focal index f0a1b09a13..af0c2d2fa9 100644 --- a/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/changelog-focal +++ b/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/changelog-focal @@ -1,8 +1,8 @@ securedrop-app-code (2.3.0~rc1+focal) focal; urgency=medium - * See changelog.md + * see changelog.md - -- SecureDrop Team Fri, 18 Feb 2022 11:38:54 -0500 + -- SecureDrop Team Tue, 15 Mar 2022 11:55:18 -0400 securedrop-app-code (2.2.0+focal) focal; urgency=medium From b7af2e8fbceaa036392b4fea1816183429d41cf2 Mon Sep 17 00:00:00 2001 From: Kevin O'Gorman Date: Wed, 16 Mar 2022 21:51:50 -0400 Subject: [PATCH 2/4] SecureDrop 2.3.0-rc2 (cherry picked from commit 526356bc13bbee7eefc98f3855ef1d297541ba1a) --- changelog.md | 7 ++++++- install_files/ansible-base/group_vars/all/securedrop | 2 +- .../files/changelog-focal | 6 ++++++ molecule/builder-focal/tests/vars.yml | 2 +- securedrop/version.py | 2 +- setup.py | 2 +- 6 files changed, 16 insertions(+), 5 deletions(-) diff --git a/changelog.md b/changelog.md index 0999fb5ee7..fe119a5072 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,10 @@ # Changelog +## 2.3.0~rc2 + +* Bugfix: updated instance_config message filter fields to set default values (#6345) +* Bugfix: updated Apache2 apparmor profile to include new template file (#6344) + ## 2.3.0~rc1 ### Web Applications @@ -19,10 +24,10 @@ * Added /robots.txt route and meta tags to disallow bots on the Source Interface (#6299) * Fixed text overflow issue in the "Read Replies" widget (#6301) * Updated data attributes in the codename widget to be translateable strings (#6288) +* Added support for future user-agent strings with a 3-digit Firefox version (#6309) ### Development -* Added support for future user-agent strings with a 3-digit Firefox version (#6309) * Updated `make shellcheck` to optionally use podman instead of Docker (#6239) * Updated `make dev-tor` to set correct v3 address in Source Interface /metadata endpoint (#6308) diff --git a/install_files/ansible-base/group_vars/all/securedrop b/install_files/ansible-base/group_vars/all/securedrop index 46c45fe152..ab88f14373 100644 --- a/install_files/ansible-base/group_vars/all/securedrop +++ b/install_files/ansible-base/group_vars/all/securedrop @@ -2,7 +2,7 @@ # Variables that apply to both the app and monitor server go in this file # If the monitor or app server need different values define the variable in # hosts_vars/app.yml or host_vars/mon.yml -securedrop_version: "2.3.0~rc1" +securedrop_version: "2.3.0~rc2" securedrop_app_code_sdist_name: "securedrop-app-code-{{ securedrop_version | replace('~', '-') }}.tar.gz" grsecurity: true diff --git a/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/changelog-focal b/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/changelog-focal index af0c2d2fa9..b39332c196 100644 --- a/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/changelog-focal +++ b/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/changelog-focal @@ -1,3 +1,9 @@ +securedrop-app-code (2.3.0~rc2+focal) focal; urgency=medium + + * see changelog.md + + -- SecureDrop Team Wed, 16 Mar 2022 21:51:14 -0400 + securedrop-app-code (2.3.0~rc1+focal) focal; urgency=medium * see changelog.md diff --git a/molecule/builder-focal/tests/vars.yml b/molecule/builder-focal/tests/vars.yml index a52d879964..e7159ab84d 100644 --- a/molecule/builder-focal/tests/vars.yml +++ b/molecule/builder-focal/tests/vars.yml @@ -1,5 +1,5 @@ --- -securedrop_version: "2.3.0~rc1" +securedrop_version: "2.3.0~rc2" ossec_version: "3.6.0" keyring_version: "0.1.5" config_version: "0.1.4" diff --git a/securedrop/version.py b/securedrop/version.py index d8f0e76570..997cf0c7c3 100644 --- a/securedrop/version.py +++ b/securedrop/version.py @@ -1 +1 @@ -__version__ = '2.3.0~rc1' +__version__ = '2.3.0~rc2' diff --git a/setup.py b/setup.py index d7fa23dd86..d71cbbdccb 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ setuptools.setup( name="securedrop-app-code", - version="2.3.0~rc1", + version="2.3.0~rc2", author="Freedom of the Press Foundation", author_email="securedrop@freedom.press", description="SecureDrop Server", From 045fdbb858e9bc1c184094e660cc84c18aa87c63 Mon Sep 17 00:00:00 2001 From: Kevin O'Gorman Date: Tue, 29 Mar 2022 19:15:58 -0400 Subject: [PATCH 3/4] SecureDrop 2.3.0 (cherry picked from commit 836d47bc3b9a2323e192688dd0c26aab0fd3d983) --- changelog.md | 11 +++-------- install_files/ansible-base/group_vars/all/securedrop | 2 +- .../files/changelog-focal | 12 ++++++------ molecule/builder-focal/tests/vars.yml | 2 +- molecule/shared/stable.ver | 2 +- securedrop/version.py | 2 +- setup.py | 2 +- 7 files changed, 14 insertions(+), 19 deletions(-) diff --git a/changelog.md b/changelog.md index fe119a5072..ff6abdfa2c 100644 --- a/changelog.md +++ b/changelog.md @@ -1,18 +1,13 @@ # Changelog -## 2.3.0~rc2 - -* Bugfix: updated instance_config message filter fields to set default values (#6345) -* Bugfix: updated Apache2 apparmor profile to include new template file (#6344) - -## 2.3.0~rc1 +## 2.3.0 ### Web Applications -* Added optional message filtering to allow instances to set a minimum initial message length and block initial messages containing source codenames (#6306, #6340) +* Added optional message filtering to allow instances to set a minimum initial message length and block initial messages containing source codenames (#6306, #6340, #6345, #6368) * Added "skip to notification" link to allow screen-readers to navigate to flashed messages (#6336) * Updated /generate to improve and simplify instructions on use of the codename (#6330) -* Fixed untranslated string in Read Replies widget (#6321) +* Fixed untranslated string in Read Replies widget (#6321, #6344) * Updated Source Interface browser security level widget to reflect current Tor Browser UI (#6320) * Added ARIA annotations for forms in Journalist Interface (#6240) * Added tor2web detection via URL mangling (#6304) diff --git a/install_files/ansible-base/group_vars/all/securedrop b/install_files/ansible-base/group_vars/all/securedrop index ab88f14373..24290cde67 100644 --- a/install_files/ansible-base/group_vars/all/securedrop +++ b/install_files/ansible-base/group_vars/all/securedrop @@ -2,7 +2,7 @@ # Variables that apply to both the app and monitor server go in this file # If the monitor or app server need different values define the variable in # hosts_vars/app.yml or host_vars/mon.yml -securedrop_version: "2.3.0~rc2" +securedrop_version: "2.3.0" securedrop_app_code_sdist_name: "securedrop-app-code-{{ securedrop_version | replace('~', '-') }}.tar.gz" grsecurity: true diff --git a/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/changelog-focal b/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/changelog-focal index b39332c196..311e8f3d1a 100644 --- a/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/changelog-focal +++ b/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/changelog-focal @@ -1,14 +1,14 @@ -securedrop-app-code (2.3.0~rc2+focal) focal; urgency=medium +securedrop-app-code (2.3.0+focal) focal; urgency=medium - * see changelog.md + * see changelog.md - -- SecureDrop Team Wed, 16 Mar 2022 21:51:14 -0400 + -- SecureDrop Team Tue, 29 Mar 2022 19:13:30 -0400 -securedrop-app-code (2.3.0~rc1+focal) focal; urgency=medium +securedrop-app-code (2.2.1+focal) focal; urgency=medium - * see changelog.md + * See changelog.md - -- SecureDrop Team Tue, 15 Mar 2022 11:55:18 -0400 + -- SecureDrop Team Thu, 10 Mar 2022 09:34:17 -0800 securedrop-app-code (2.2.0+focal) focal; urgency=medium diff --git a/molecule/builder-focal/tests/vars.yml b/molecule/builder-focal/tests/vars.yml index e7159ab84d..1ba49558fc 100644 --- a/molecule/builder-focal/tests/vars.yml +++ b/molecule/builder-focal/tests/vars.yml @@ -1,5 +1,5 @@ --- -securedrop_version: "2.3.0~rc2" +securedrop_version: "2.3.0" ossec_version: "3.6.0" keyring_version: "0.1.5" config_version: "0.1.4" diff --git a/molecule/shared/stable.ver b/molecule/shared/stable.ver index ccbccc3dc6..276cbf9e28 100644 --- a/molecule/shared/stable.ver +++ b/molecule/shared/stable.ver @@ -1 +1 @@ -2.2.0 +2.3.0 diff --git a/securedrop/version.py b/securedrop/version.py index 997cf0c7c3..82190396f2 100644 --- a/securedrop/version.py +++ b/securedrop/version.py @@ -1 +1 @@ -__version__ = '2.3.0~rc2' +__version__ = '2.3.0' diff --git a/setup.py b/setup.py index d71cbbdccb..381e358aec 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ setuptools.setup( name="securedrop-app-code", - version="2.3.0~rc2", + version="2.3.0", author="Freedom of the Press Foundation", author_email="securedrop@freedom.press", description="SecureDrop Server", From 17736de383670c76efc3b16a131dddeebf8a000d Mon Sep 17 00:00:00 2001 From: Kevin O'Gorman Date: Wed, 30 Mar 2022 10:19:21 -0400 Subject: [PATCH 4/4] Bump develop version to 2.4.0~rc1 --- changelog.md | 2 ++ install_files/ansible-base/group_vars/all/securedrop | 2 +- .../files/changelog-focal | 8 +++++++- molecule/builder-focal/tests/vars.yml | 2 +- securedrop/version.py | 2 +- setup.py | 2 +- 6 files changed, 13 insertions(+), 5 deletions(-) diff --git a/changelog.md b/changelog.md index ff6abdfa2c..b55a0885de 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,7 @@ # Changelog +## 2.4.0~rc1 + ## 2.3.0 ### Web Applications diff --git a/install_files/ansible-base/group_vars/all/securedrop b/install_files/ansible-base/group_vars/all/securedrop index 24290cde67..4e44df6528 100644 --- a/install_files/ansible-base/group_vars/all/securedrop +++ b/install_files/ansible-base/group_vars/all/securedrop @@ -2,7 +2,7 @@ # Variables that apply to both the app and monitor server go in this file # If the monitor or app server need different values define the variable in # hosts_vars/app.yml or host_vars/mon.yml -securedrop_version: "2.3.0" +securedrop_version: "2.4.0~rc1" securedrop_app_code_sdist_name: "securedrop-app-code-{{ securedrop_version | replace('~', '-') }}.tar.gz" grsecurity: true diff --git a/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/changelog-focal b/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/changelog-focal index 311e8f3d1a..1ece678f57 100644 --- a/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/changelog-focal +++ b/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/changelog-focal @@ -1,6 +1,12 @@ +securedrop-app-code (2.4.0~rc1+focal) focal; urgency=medium + + * see changelog.md + + -- SecureDrop Team Wed, 30 Mar 2022 10:18:53 -0400 + securedrop-app-code (2.3.0+focal) focal; urgency=medium - * see changelog.md + * see changelog.md -- SecureDrop Team Tue, 29 Mar 2022 19:13:30 -0400 diff --git a/molecule/builder-focal/tests/vars.yml b/molecule/builder-focal/tests/vars.yml index 1ba49558fc..8cbe8c899f 100644 --- a/molecule/builder-focal/tests/vars.yml +++ b/molecule/builder-focal/tests/vars.yml @@ -1,5 +1,5 @@ --- -securedrop_version: "2.3.0" +securedrop_version: "2.4.0~rc1" ossec_version: "3.6.0" keyring_version: "0.1.5" config_version: "0.1.4" diff --git a/securedrop/version.py b/securedrop/version.py index 82190396f2..7ba4b76afe 100644 --- a/securedrop/version.py +++ b/securedrop/version.py @@ -1 +1 @@ -__version__ = '2.3.0' +__version__ = '2.4.0~rc1' diff --git a/setup.py b/setup.py index 381e358aec..b92c652fce 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ setuptools.setup( name="securedrop-app-code", - version="2.3.0", + version="2.4.0~rc1", author="Freedom of the Press Foundation", author_email="securedrop@freedom.press", description="SecureDrop Server",