Commit Graph

7237 Commits

Author SHA1 Message Date
Thomas Waldmann 906962b631
setup.py: declare python 3.12 support 2023-09-25 15:33:02 +02:00
Thomas Waldmann ce274aa11c
test on python 3.12-dev 2023-09-25 15:29:30 +02:00
TW 47e65d9c00
Merge pull request #7842 from ThomasWaldmann/offline-docs2-1.2
offline docs: remove epub, pdf. only build htlmzip.
2023-09-25 15:15:10 +02:00
Thomas Waldmann 377d02c4b2
offline docs: remove epub, pdf. only build htlmzip.
something is broken with these, build fails.
2023-09-25 15:14:26 +02:00
TW 20f9953293
Merge pull request #7841 from ThomasWaldmann/offline-docs-1.2
readthedocs: also build offline docs, fixes #7835 (1.2-maint)
2023-09-25 14:47:52 +02:00
TW 6170ab7d34
Merge pull request #7840 from ThomasWaldmann/allow-msgpack106-1.2
Allow msgpack 1.0.6 (1.2-maint)
2023-09-25 14:47:28 +02:00
Thomas Waldmann da2b885179
readthedocs: also build offline docs, fixes #7835 2023-09-25 14:24:13 +02:00
Thomas Waldmann ed87e45bab
use setuptools_scm < 8 for now
https://github.com/pypa/setuptools_scm/issues/938
2023-09-25 14:14:51 +02:00
Thomas Waldmann 93b93abc18
allow msgpack 1.0.6 2023-09-25 14:10:32 +02:00
Thomas Waldmann 6dbfbd6a19
activate tracebacks for TAM exceptions 2023-09-25 11:01:38 +02:00
TW 0c198160f8
Merge pull request #7821 from ThomasWaldmann/vagrant-updates-1.2
vagrant: add VM with debian bookworm
2023-09-12 22:07:41 +02:00
Thomas Waldmann 3d367b0fd3
vagrant: add VM with debian bookworm
this also brings OpenSSL 3.0.x.
2023-09-12 18:41:38 +02:00
TW 83028c0b89
Merge pull request #7820 from ThomasWaldmann/remove-twine-1.2
remove twine from requirements
2023-09-12 17:37:34 +02:00
Thomas Waldmann 1407a2b2fb
remove twine from requirements
twine is only needed at release time, no need
for all developers or all test runs to install
this.

also, some requirement of twine needs a rust
compiler, so if there is no rust compiler,
automated runs will abort due to that.
2023-09-12 17:05:02 +02:00
TW a0069d4b45
Merge pull request #7801 from ThomasWaldmann/fix-upgrade-docs-1.2
docs: minor fix to CVE-2023-36811 related upgrade instructions
2023-09-02 15:53:06 +02:00
Thomas Waldmann 97b8eb2104
docs: minor fix to CVE-2023-36811 related upgrade instructions
while the main issue in the code has been fixed since 1.2.5,
let's better refer to 1.2.6, which has fixes in upgrade docs and code.
2023-09-02 15:47:13 +02:00
TW ee6a8e2ddf
Merge pull request #7798 from ThomasWaldmann/check-improve-TAM-logging-1.2
check: improve logging for TAM issues, fixes #7797
2023-09-01 22:07:59 +02:00
Thomas Waldmann 7fd91f4bb8
check: improve logging for TAM issues, fixes #7797 2023-09-01 15:35:04 +02:00
TW 65d75c167a
Merge pull request #7792 from ThomasWaldmann/rel126
Release 1.2.6
2023-08-31 23:37:46 +02:00
Thomas Waldmann 98dea3e876
requirements: remove cython restrictions 2023-08-31 01:03:34 +02:00
Thomas Waldmann c133303243
update CHANGES, incl. upgrade instructions 2023-08-31 01:02:44 +02:00
Thomas Waldmann d05d02f238
implement BORG_WORKAROUNDS=ignore_invalid_archive_tam, see #7791 2023-08-31 00:36:04 +02:00
TW 7ab28487ce
Merge pull request #7790 from ThomasWaldmann/fix-changelog-markup-1.2
fix changelog markup
2023-08-30 18:41:31 +02:00
Thomas Waldmann 447d0df1bb
fix changelog markup 2023-08-30 18:36:42 +02:00
TW f7a93b30fa
Merge pull request #7788 from ThomasWaldmann/fix-cve-docs-1.2
fix CVE timeline
2023-08-30 14:41:05 +02:00
Thomas Waldmann ee33c22443
fix CVE timeline 2023-08-30 14:39:41 +02:00
TW c8b9d72bdb
Merge pull request from GHSA-8fjr-hghr-4m99
Release 1.2.5 incl. archives TAM security fix
2023-08-30 14:18:17 +02:00
Thomas Waldmann 509a5fd71c
build_usage / build_man 2023-08-30 03:49:47 +02:00
Thomas Waldmann ed1ab84cc7
update CHANGES 2023-08-30 03:47:35 +02:00
Thomas Waldmann 9e63abb679
document vulnerability, repo upgrade procedure 2023-08-30 02:52:34 +02:00
Thomas Waldmann 5e0632a3d0
add tests for archive TAMs, upgrade 2023-08-30 02:52:32 +02:00
Thomas Waldmann d78ed697ae
rebuild_refcounts: keep archive ID, if possible
rebuild_refcounts verifies and recreates the TAM.
Now it re-uses the salt, so that the archive ID does not change
just because of a new salt if the archive has still the same data.
2023-08-30 02:52:27 +02:00
Thomas Waldmann 85b173d3d1
TAM msgs: be more specific: archives vs. manifest 2023-08-30 02:52:23 +02:00
Thomas Waldmann 7d0d11b979
upgrade: allow enable/disable manifest TAM for unencrypted repos
Recent borg wrote TAM authenticated **archives**
even for unencrypted repos (encryption "none"),
so we also do that for the manifest.

It's kind of fake as there is no secret key involved then,
but it simplifies the code.
2023-08-30 02:52:21 +02:00
Thomas Waldmann 19a7809fe8
upgrade --archives-tam: make sure all archives are TAM authenticated
borg check (rebuild_manifest and rebuild_refcounts) drops archives without TAM,
so let's just always add the TAM.

for unencrypted repos (encryption=none) the TAM is insecure,
but without encryption and authentication, there is no expectation
of security anyway.
2023-08-30 02:52:17 +02:00
Thomas Waldmann 75518d945c
list: support {tam} placeholder. check archive TAM.
list: shows either "verified" or "none", depending on
whether a TAM auth tag could be verified or was
missing (old archives from borg < 1.0.9).

when loading an archive, we now try to verify the archive
TAM, but we do not require it. people might still have
old archives in their repos and we want to be able to
list such repos without fatal exceptions.
2023-08-30 02:52:15 +02:00
Thomas Waldmann 155d8ee23b
cache sync: check archive TAM 2023-08-30 02:52:13 +02:00
Thomas Waldmann 7da8738513
check: rebuild_refcounts verify and recreate TAM
This part of the archive checker recreates the Archive
items (always, just in case some missing chunks needed
repairing).

When loading the Archive item, we now verify the TAM.
When saving the (potentially modified) Archive item,
we now (re-)generate the TAM.

Archives without a valid TAM are dropped rather than TAM-authenticated
when saving them. There shouldn't be any archives without a valid TAM:

- borg writes an archive TAM since long (1.0.9)
- users are expected to TAM-authenticate archives created
  by older borg when upgrading to borg 1.2.5.

Also:

Archive.set_meta: TAM-authenticate new archive

This is also used by Archive.rename and .recreate.
2023-08-30 02:51:52 +02:00
Thomas Waldmann 1fd94bd38f
check: rebuild_manifest must verify archive TAM 2023-08-29 21:59:04 +02:00
TW 8ae06199ef
Merge pull request #7784 from ThomasWaldmann/vagrant-updates-1.2
Vagrant updates (1.2-maint)
2023-08-29 20:49:13 +02:00
Thomas Waldmann de51c67085
vagrant: fix netbsd pkgsrc
9.0_current stopped working, let's use 9.3.
2023-08-29 19:45:39 +02:00
Thomas Waldmann 055fb76bd8
vagrant / binary build: use python 3.9.18 2023-08-29 19:44:30 +02:00
TW 9133cf5f36
Merge pull request #7783 from ThomasWaldmann/rel-prep-1.2
build_man / build_usage
2023-08-29 18:50:04 +02:00
Thomas Waldmann 62ca4f666b
build_man / build_usage 2023-08-29 18:48:41 +02:00
TW a034febe55
Merge pull request #7782 from ThomasWaldmann/update-changes-1.2
update CHANGES
2023-08-29 18:34:10 +02:00
Thomas Waldmann 7f07f81e39
update CHANGES 2023-08-29 18:24:56 +02:00
TW 186b3d1319
Merge pull request #7781 from ThomasWaldmann/cy029-1.2
require cython <3 for now
2023-08-29 16:15:33 +02:00
Thomas Waldmann f8673a379c
require cython <3 for now
also in requirements.d/development.txt.
2023-08-29 16:09:08 +02:00
TW 844ca6b61e
Merge pull request #7772 from ThomasWaldmann/cython029-1.2
use cython 0.29 (1.2-maint)
2023-08-26 14:44:54 +02:00
Thomas Waldmann 37a813f7f8
stay on latest Cython 0.29 (0.29.36) for borg 1.2.x
master branch tests Cython 3 now.
1.2-maint branch may or may not upgrade to build with Cython 3 later.
2023-08-26 14:18:23 +02:00