diff --git a/.github/workflows/lock-threads.yml b/.github/workflows/lock-threads.yml index 71f72b17..432c9880 100644 --- a/.github/workflows/lock-threads.yml +++ b/.github/workflows/lock-threads.yml @@ -1,14 +1,14 @@ name: '🔒 Lock Threads' +permissions: + issues: write + pull-requests: write + on: schedule: - cron: '0 0 * * *' workflow_dispatch: -permissions: - issues: write - pull-requests: write - concurrency: group: lock diff --git a/.github/workflows/mega-linter.yml b/.github/workflows/mega-linter.yml index e39b42ad..0ce62fb0 100644 --- a/.github/workflows/mega-linter.yml +++ b/.github/workflows/mega-linter.yml @@ -46,9 +46,9 @@ jobs: VALIDATE_ALL_CODEBASE: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} DISABLE: COPYPASTE,SPELL,HTML - DISABLE_LINTERS: JSON_JSONLINT,MARKDOWN_MARKDOWN_TABLE_FORMATTER + DISABLE_LINTERS: CSS_SCSS_LINT,JSON_JSONLINT,MARKDOWN_MARKDOWN_TABLE_FORMATTER,REPOSITORY_GIT_DIFF,YAML_V8R,MARKDOWN_MARKDOWNLINT_NO_TRAILING_SPACES,MARKDOWN_MARKDOWNLINT_NO_DUPLICATE_HEADING DISABLE_ERRORS_LINTERS: CSS_STYLELINT,MARKDOWN_MARKDOWN_LINK_CHECK,YAML_YAMLLINT,DOCKERFILE_HADOLINT,REPOSITORY_TRIVY,REPOSITORY_CHECKOV,REPOSITORY_GITLEAKS - MARKDOWN_MARKDOWNLINT_FILTER_REGEX_EXCLUDE: '(export/|briar\.md)' + MARKDOWN_MARKDOWNLINT_FILTER_REGEX_EXCLUDE: '(export/|briar\.md|donations\.md|LICENSE\.md)' # Upload MegaLinter artifacts - name: Archive MegaLinter reports diff --git a/CHANGELOG.md b/CHANGELOG.md index 4ff36601..2e1ad50d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +v1.2.0 + +- Rotate GPG/PGP keys (See [Open Collective key rotation](https://opencollective.com/anonymousplanetorg/updates/key-rotation-update)) +- Switch to Megalinter in [#344](https://github.com/Anon-Planet/thgtoa/pull/344) + v1.1.9 - Add dependency check action @@ -9,11 +14,11 @@ v1.1.9 v1.1.8 - Add AnarSec to links -- CICD: fix automatic VT scans +- CI/CD: fix automatic VT scans - Appendix D: remove trailing period in title -- CICD: lock old issues & pull requests +- CI/CD: lock old issues & pull requests - Tor onion offline -- CICD: update issues template +- CI/CD: update issues template - Revert "Quantum resistance and good crypto algos" v1.1.7 diff --git a/KEY_ROTATION.md b/KEY_ROTATION.md index a70bafa3..3597190c 100644 --- a/KEY_ROTATION.md +++ b/KEY_ROTATION.md @@ -8,9 +8,13 @@ Current master key fingerprint: `9FA5 436D 0EE3 6098 5157 3825 17EC A05F 768D E Current release key fingerprint: `C302 3DBE A3FB 38C4 38BA 1EED CEC6 0AED E8B9 92A2` Current email key fingerprint: `FCBD 2CAB DEFD 1FBA 2E9E 7591 A1A8 2CD2 DD2C F890` -The email and release keys should be signed by the master key. +You can import the current master signing key for Anonymous Planet from the repo root: +`gpg2 --import keys/*Master-Signing-Key_*.asc` + +The email and release keys should be signed by the master keys. The master key takes precedence over all other project keys. ------------------------------------------------------------------------------------ + Minisign key ``` untrusted comment: minisign public key 902835EC74825934 diff --git a/_config.yml b/_config.yml index 9deb7502..db44d4c5 100644 --- a/_config.yml +++ b/_config.yml @@ -11,7 +11,6 @@ relative_links: title: The Hitchhiker's Guide to Online Anonymity description: The Hitchhiker's Guide to Online Anonymity tagline: The Hitchhiker's Guide to Online Anonymity -author: AnonymousPlanet theme: jekyll-theme-hacker github: home_url: index.html diff --git a/_layouts/default.html b/_layouts/default.html index 6cfebbea..25b6f501 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -155,7 +155,7 @@

The Hitchhiker’s Guide to Online Anonymity

How I learned to start worrying and love privacy anonymity

-

The latest Version is v1.1.9. See the changelog.

+

The latest Version is v1.2.0. See the changelog.

{% if page.url != "/" %} Home diff --git a/about.md b/about.md index f86ec1b3..e0448b64 100644 --- a/about.md +++ b/about.md @@ -9,7 +9,7 @@ Please share this project if you enjoy it and think it might be useful to others Follow or contact us on: - Twitter: - Mastodon: -- E-Mail: (You may use our [PGP public key](https://anonymousplanet.org/pgp/AnonymousPlanet-Email-Key_FCBD2CABDEFD1FBA2E9E7591A1A82CD2DD2CF890.asc) to encrypt e-mails. Do not forget to attach your PGP public key if you want an encrypted answer) +- E-Mail: (You may use our [PGP public key](keys/Email-Key_FCBD2CABDEFD1FBA2E9E7591A1A82CD2DD2CF890.asc) to encrypt e-mails. Do not forget to attach your PGP public key if you want an encrypted answer) Discussion Channels: - Matrix room: ```#anonymity:matrix.org``` diff --git a/clean.sh b/clean.sh index aad0432c..cc2964c5 100755 --- a/clean.sh +++ b/clean.sh @@ -8,7 +8,7 @@ rm -rf export/*.asc &> /dev/null rm -rf export/sha256sum.txt &> /dev/null rm -rf export/b2sum.txt &> /dev/null rm -rf export/* &> /dev/null -rm -rf *.md.asc &> /dev/null -rm -rf *.txt.asc &> /dev/null +rm -rf ./*.md.asc &> /dev/null +rm -rf ./*.txt.asc &> /dev/null true diff --git a/pgp/AnonymousPlanet-Email-Key_FCBD2CABDEFD1FBA2E9E7591A1A82CD2DD2CF890.asc b/keys/Email-Key_FCBD2CABDEFD1FBA2E9E7591A1A82CD2DD2CF890.asc similarity index 100% rename from pgp/AnonymousPlanet-Email-Key_FCBD2CABDEFD1FBA2E9E7591A1A82CD2DD2CF890.asc rename to keys/Email-Key_FCBD2CABDEFD1FBA2E9E7591A1A82CD2DD2CF890.asc diff --git a/pgp/AnonymousPlanet-Master-Signing-Key_9FA5436D0EE360985157382517ECA05F768DEDF6.asc b/keys/Master-Signing-Key_9FA5436D0EE360985157382517ECA05F768DEDF6.asc similarity index 100% rename from pgp/AnonymousPlanet-Master-Signing-Key_9FA5436D0EE360985157382517ECA05F768DEDF6.asc rename to keys/Master-Signing-Key_9FA5436D0EE360985157382517ECA05F768DEDF6.asc diff --git a/pgp/AnonymousPlanet-Release-Signing-Key_C3023DBEA3FB38C438BA1EEDCEC60AEDE8B992A2.asc b/keys/Release-Signing-Key_C3023DBEA3FB38C438BA1EEDCEC60AEDE8B992A2.asc similarity index 100% rename from pgp/AnonymousPlanet-Release-Signing-Key_C3023DBEA3FB38C438BA1EEDCEC60AEDE8B992A2.asc rename to keys/Release-Signing-Key_C3023DBEA3FB38C438BA1EEDCEC60AEDE8B992A2.asc diff --git a/pgp/old/42FF35DB9DE7C088AB0FD4A70C216A52F6DF4920.asc b/keys/old/42FF35DB9DE7C088AB0FD4A70C216A52F6DF4920.asc similarity index 98% rename from pgp/old/42FF35DB9DE7C088AB0FD4A70C216A52F6DF4920.asc rename to keys/old/42FF35DB9DE7C088AB0FD4A70C216A52F6DF4920.asc index 81410dbb..f9c35ef5 100644 --- a/pgp/old/42FF35DB9DE7C088AB0FD4A70C216A52F6DF4920.asc +++ b/keys/old/42FF35DB9DE7C088AB0FD4A70C216A52F6DF4920.asc @@ -1,62 +1,62 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- - -mQINBGJ0q9cBEAC6RerT9DevGMJpkim8espPdeKdHb03X5ovxE1BnR6Id6sh+2tc -RDUhdkqkezBi22HL1P+tuWInwYKe40UGTCIZE6ypXiWQur65zVhrQvrJdTnJcBNB -7BA+2vbgt17Uts7PSlc8CMdHp9u2s3CCluYYheuXFNEFfDi12cKu1UIq2b315um7 -qVLpn34vSe9bfI4oOm/BMzPkiIMxQ4+7uF9wUVSUA2kizL0HpW8O2kxRQ0/45kEQ -vuvpY2HwnvY0OMoqqduCY0Zfm+ExKvZhULBxGpsb76sF96bCXFr4GKDl3Uos9Hkj -qea/MPfg22MmDQYKF0LcM6LmpTW+SDZZ+CmAh1jGCx62ixF1BnLOP1In5KM++1f4 -g5tOlnOjhcaAAtVCF+CRq2tRfSVy5vh/JdtRYEhB7oyrWbk4gN+BSVl2V+aBhLzj -Uu+ldURvtGjKyCHfUUm7MxLLCc2VqWnFuoMvf3n3lTRfH6J5KlEvbMeurCbCbxzn -SPUyraZJZ9VRMtG2kRsQYmtEZkgwX5SLbpameXwzVYaGY+F6NavqIgl5rCLQG4OC -/mlanJQ7w0uHCSqrIZ9hXS5Lr1W7ZkANHWgikwkOrSIxGci5njK0Cq5mJEUawttH -U+jUIY/fHF+EuiY2afWguTg2WVJcSVgJCJCeolZvwbMsATKQjBlj5wG/3wARAQAB -tGhBbGV4IEFuZGVyc29uIChSZXBsYWNlcyA3REZGRDc0NzFGQjc2RTJBOEFCQkJD -RERENzY5QjM3NDlFOTMzQjhBKSA8dGhlaGVhZGxlc3NzZXJwZW50c2VjQHByb3Rv -bm1haWwuY29tPokCTgQTAQoAOBYhBEL/Ndud58CIqw/UpwwhalL230kgBQJidKvX -AhsDBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAAAoJEAwhalL230kg4VMQAJ09xUTQ -JZjW0GI44n2f0gDEFHEJ8ElVXANb/47gB8cVL4snlPTvwpmGbgO1BTZpNGltoEub -760Vh/1Kzto/bT3vJF+v1WPSDjs6i5R/yoZVtrkn15RK0mN4Ik/S1fQiKIMf/csw -kAro+y34QeMJ9eUJa8seW+tAvdnlc4GdYVqJWkC27d3bUJSOEVxmNo8bjCxHcanx -SFLYeRv1t/uc7UEZS14OiqH6a7OY3srGnjalFORhDLGXYZyOTCEvkHQa24WzQc8d -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 -MNjqbbfGzFKzqTuw+FBeHuEwgdI/miiYHDM= -=1Fuy ------END PGP PUBLIC KEY BLOCK----- +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQINBGJ0q9cBEAC6RerT9DevGMJpkim8espPdeKdHb03X5ovxE1BnR6Id6sh+2tc +RDUhdkqkezBi22HL1P+tuWInwYKe40UGTCIZE6ypXiWQur65zVhrQvrJdTnJcBNB +7BA+2vbgt17Uts7PSlc8CMdHp9u2s3CCluYYheuXFNEFfDi12cKu1UIq2b315um7 +qVLpn34vSe9bfI4oOm/BMzPkiIMxQ4+7uF9wUVSUA2kizL0HpW8O2kxRQ0/45kEQ +vuvpY2HwnvY0OMoqqduCY0Zfm+ExKvZhULBxGpsb76sF96bCXFr4GKDl3Uos9Hkj +qea/MPfg22MmDQYKF0LcM6LmpTW+SDZZ+CmAh1jGCx62ixF1BnLOP1In5KM++1f4 +g5tOlnOjhcaAAtVCF+CRq2tRfSVy5vh/JdtRYEhB7oyrWbk4gN+BSVl2V+aBhLzj +Uu+ldURvtGjKyCHfUUm7MxLLCc2VqWnFuoMvf3n3lTRfH6J5KlEvbMeurCbCbxzn +SPUyraZJZ9VRMtG2kRsQYmtEZkgwX5SLbpameXwzVYaGY+F6NavqIgl5rCLQG4OC +/mlanJQ7w0uHCSqrIZ9hXS5Lr1W7ZkANHWgikwkOrSIxGci5njK0Cq5mJEUawttH +U+jUIY/fHF+EuiY2afWguTg2WVJcSVgJCJCeolZvwbMsATKQjBlj5wG/3wARAQAB +tGhBbGV4IEFuZGVyc29uIChSZXBsYWNlcyA3REZGRDc0NzFGQjc2RTJBOEFCQkJD +RERENzY5QjM3NDlFOTMzQjhBKSA8dGhlaGVhZGxlc3NzZXJwZW50c2VjQHByb3Rv +bm1haWwuY29tPokCTgQTAQoAOBYhBEL/Ndud58CIqw/UpwwhalL230kgBQJidKvX +AhsDBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAAAoJEAwhalL230kg4VMQAJ09xUTQ +JZjW0GI44n2f0gDEFHEJ8ElVXANb/47gB8cVL4snlPTvwpmGbgO1BTZpNGltoEub +760Vh/1Kzto/bT3vJF+v1WPSDjs6i5R/yoZVtrkn15RK0mN4Ik/S1fQiKIMf/csw +kAro+y34QeMJ9eUJa8seW+tAvdnlc4GdYVqJWkC27d3bUJSOEVxmNo8bjCxHcanx +SFLYeRv1t/uc7UEZS14OiqH6a7OY3srGnjalFORhDLGXYZyOTCEvkHQa24WzQc8d ++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 +MNjqbbfGzFKzqTuw+FBeHuEwgdI/miiYHDM= +=1Fuy +-----END PGP PUBLIC KEY BLOCK----- diff --git a/pgp/old/contact@anonymousplanet.org-old-public-key.asc b/keys/old/contact@anonymousplanet.org-old-public-key.asc similarity index 100% rename from pgp/old/contact@anonymousplanet.org-old-public-key.asc rename to keys/old/contact@anonymousplanet.org-old-public-key.asc diff --git a/make.sh b/make.sh index 7c5d380f..6a6e8f17 100755 --- a/make.sh +++ b/make.sh @@ -8,7 +8,7 @@ if [[ "$1" == "" ]]; then "$0" "$bn" done echo "Built all documents. Calculating hashes..." - cd export/ + cd export/ || exit sha256sum ./* > sha256sum.txt b2sum ./* > b2sum.txt echo "Calculated hashes. Signing generated files..." @@ -30,10 +30,10 @@ if [[ "$1" == "" ]]; then done cp /home/user/KEY_ROTATION.md.asc ./KEY_ROTATION.md.asc cp /home/user/KEY_ROTATION.md.minisig ./KEY_ROTATION.md.minisig - sha256sum *.md > sha256sum.txt + sha256sum ./*.md > sha256sum.txt gpg --default-key C3023DBEA3FB38C438BA1EEDCEC60AEDE8B992A2 --armor --detach-sign sha256sum.txt yes '' | minisign -S -s /home/user/.minisign/minisign.key -m sha256sum.txt - b2sum *.md > b2sum.txt + b2sum ./*.md > b2sum.txt gpg --default-key C3023DBEA3FB38C438BA1EEDCEC60AEDE8B992A2 --armor --detach-sign b2sum.txt yes '' | minisign -S -s /home/user/.minisign/minisign.key -m b2sum.txt echo "Signed all files." diff --git a/verify.md b/verify.md index beef096f..ac37d13c 100644 --- a/verify.md +++ b/verify.md @@ -60,7 +60,7 @@ Once you have the master key downloaded, imported, and certified, you will obtai ```gpg --auto-key-locate nodefault,wkd --locate-keys C3023DBEA3FB38C438BA1EEDCEC60AEDE8B992A2``` (to import the release signing key) - (to download the key yourself) + (to download the key yourself) If you use GPG directly, you won't need to mark the release signing key as trusted, because it's already signed by the master signing key. If you use Kleopatra, the process to import the release signing key is the same as importing the master signing key.