1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2024-12-27 02:08:54 +00:00
Commit graph

8241 commits

Author SHA1 Message Date
Thomas Waldmann
62114466e4
CVE-2023-36811 upgrade docs: consider checkpoint archives, fixes #7802
The traceback seen there came from borg not showing a .checkpoint archive
that didn't have a valid TAM and thus the user not see it / fix it:

https://github.com/borgbackup/borg/issues/7802#issuecomment-1793860606
2023-11-06 14:34:15 +01:00
TW
e431b838f4
Merge pull request #7910 from ThomasWaldmann/fix-shadow-index-master
Fix shadow index (master)
2023-11-05 20:17:48 +01:00
TW
d9fde26243
Merge pull request #7907 from ThomasWaldmann/update-docs-master
Update docs (master)
2023-11-05 19:08:43 +01:00
TW
fba3e388aa
Merge pull request #7909 from ThomasWaldmann/sort-by-aliases-master
--sort-by: support "archive" as alias of "name", fixes #7873
2023-11-05 19:08:25 +01:00
TW
b246e306bd
Merge pull request #7908 from ThomasWaldmann/fix-inv-pattern-errorhandling-master
Fix arg parsing error handling (master)
2023-11-05 19:08:08 +01:00
Thomas Waldmann
57f3dd1dae
check --repair: recreate shadow index, see #6687
before this fix, borg check --repair just created an
empty shadow index, which can lead to incomplete
entries if entries are added later.

and such incomplete (but present) entries can lead to
compact_segments() resurrecting old PUTs by accidentally
dropping related DELs.
2023-11-05 18:45:22 +01:00
Thomas Waldmann
7892e4212b
check --repair: test if shadow index is recreated
still failing here, because it is not.
2023-11-05 18:41:31 +01:00
Thomas Waldmann
5d28992b51
shadow index: add more comments 2023-11-05 18:30:00 +01:00
Thomas Waldmann
3ba533ac50
shadow index updates: simplify and more comments
no functional change here.
2023-11-05 18:28:48 +01:00
Thomas Waldmann
6d9513f507
update shadow index when doing a double-put, fixes #5661
this fixes the test added in previous commit (avoids
that the PUT reappears after index rebuild).
2023-11-05 18:25:06 +01:00
Thomas Waldmann
3b1c0df7c8
test the shadowing-by-double-put behaviour, see #5661
the new test is currently failing due to a bug in the
repository code.
2023-11-05 18:22:57 +01:00
Thomas Waldmann
fa1e9df0d1
--sort-by: support "archive" as alias of "name", fixes #7873 2023-11-05 18:05:27 +01:00
Thomas Waldmann
77cf77ec38
fix rc and msg if arg parsing throws an exception, fixes #7885
get_args() exception handling before this fix only dealt with
subclasses of "Error", but we have to expect other exceptions
there, too.

In any case, if we have some fatal exception here, we must
terminate with rc 2.

ArgumentTypeError: emit a short error message - usually this is
a user error, invoking borg in a wrong way.

Other exceptions: full info and traceback.
2023-11-05 17:58:02 +01:00
Thomas Waldmann
f86a13c438
fix invalid pattern argument error msg 2023-11-05 17:54:07 +01:00
Thomas Waldmann
613fdcd6fa
copy 1.2.x changelog notes from 1.2-maint 2023-11-05 17:48:30 +01:00
Thomas Waldmann
8f7f836eff
copy 1.x upgrade notes from 1.2-maint 2023-11-05 17:46:14 +01:00
Thomas Waldmann
774c899b7e
update 1.x change log, cve notes
fixes #7816
fixes #7813
2023-11-05 17:43:24 +01:00
Thomas Waldmann
4325656f4c
docs: not only attack/unsafe, can also be a fs issue, fixes #7853 2023-11-05 17:36:31 +01:00
TW
1f48e500f2
Merge pull request #7906 from ThomasWaldmann/blacken-master
blacken master branch
2023-11-05 14:38:15 +01:00
Thomas Waldmann
c7f0d779bf
blacken master branch 2023-11-05 13:33:25 +01:00
TW
0da4fff38b
Merge pull request #7905 from FelixSchwarz/py313-unistdh
Python 3.13: include `unistd.h` in `_chunker.c`
2023-11-05 13:26:17 +01:00
Felix Schwarz
c350c1b36d include unistd.h in _chunker.c
With Python 3.13, Python.h no longer includes the <unistd.h> standard header file:
https://docs.python.org/3.13/whatsnew/3.13.html#id8
2023-11-05 11:48:16 +01:00
TW
d25cc1b0d1
Merge pull request #7884 from ThomasWaldmann/fix-transfer-zlib-legacy
zlib legacy decompress fixes (master)
2023-10-25 00:07:21 +02:00
Thomas Waldmann
f0e9999768
zlib legacy decompress: fix tests 2023-10-24 23:33:42 +02:00
Thomas Waldmann
0ac525bb05
zlib legacy decompress: call check_fix_size method
so we also have the decompressed size in the metadata.
2023-10-24 19:45:21 +02:00
Thomas Waldmann
0cfdf6da91
zlib legacy decompress: return meta dict, fixes #7883
for the other compression methods, this is done in
the base class, but the zlib legacy does not call
that method as it also removes the header bytes,
which zlib legacy does not have.
2023-10-24 19:37:24 +02:00
TW
e1c75e8542
Merge pull request #7875 from steelman/acl_pc
linux: use pkgconfig to find libacl
2023-10-24 17:08:14 +02:00
Łukasz Stelmach
c68a158ffb linux: use pkgconfig to find libacl
Using pkgconfig gives a more meaningful error message in case libacl
development files are missing.
2023-10-24 15:00:21 +02:00
TW
9108039786
Merge pull request #7865 from ThomasWaldmann/fix-xattr-mypy-master
mypy: ignore attr-defined for errno.ENOATTR/ENODATA
2023-10-10 21:36:21 +02:00
TW
8e9c44b353
Merge pull request #7863 from ThomasWaldmann/remove-bountysource-badge-master
remove bountysource badge (master)
2023-10-10 21:01:42 +02:00
Thomas Waldmann
b78f330024
mypy: ignore attr-defined for errno.ENOATTR/ENODATA 2023-10-10 20:50:25 +02:00
Thomas Waldmann
871da25865
remove bountysource badge 2023-10-10 20:31:21 +02:00
TW
75d8abc47b
Merge pull request #7862 from ThomasWaldmann/misc-updates-master
misc. updates (master)
2023-10-10 19:48:32 +02:00
Thomas Waldmann
f7e8462bd0
vagrant: use generic/debian9 box, fixes #7579
the debian/stretch64 was broken and never fixed.
2023-10-10 17:41:58 +02:00
Thomas Waldmann
3fdbd541db
update development.lock.txt
there was some breakage with py312, so better use current tooling.
2023-10-10 17:41:16 +02:00
Thomas Waldmann
82440a2a38
github CI: test on py312 (w/o -dev) 2023-10-10 17:38:39 +02:00
Thomas Waldmann
fc0dbe2913
vagrant: install py312 via pyenv 2023-10-10 17:37:34 +02:00
Thomas Waldmann
26be8a6fe9
allow setuptools_scm >= 8 again
8.0.4 got a fix, so we can allow it again.
2023-10-10 17:35:03 +02:00
TW
adfab2b6d7
Merge pull request #7859 from debuglevel/patch-1
feat(docs): use virtualenv on Cygwin
2023-10-10 14:12:01 +02:00
Marc Kohaupt
a6b016f894
feat(docs): use virtualenv on Cygwin
Hint for Cygwin users to make sure they use a virtual environment.
Not using a virtual environment will be likely troublesome if there is already a Python installed on Windows.
2023-10-09 12:35:33 +02:00
TW
d4ea88433c
Merge pull request #7855 from ytec-nl/master
Prevent CLI argument issues in scripts/glibc_check.py
2023-10-09 01:16:00 +02:00
Ceesjan Luiten
7afa8d4626 Prevent CLI argument issues 2023-10-07 19:58:41 +02:00
TW
8fc0944950
Merge pull request #7830 from ThomasWaldmann/typed-repoobjs
replace TAMs by typed repo objects, fixes #7670
2023-09-30 21:46:51 +02:00
TW
4a688ee4f4
Merge pull request #7851 from ThomasWaldmann/allow-msgpack107-master
allow msgpack 1.0.7 (master)
2023-09-28 15:36:40 +02:00
Thomas Waldmann
cdcab4df68
allow msgpack 1.0.7 2023-09-28 14:31:03 +02:00
TW
e4669ec316
Merge pull request #7843 from ThomasWaldmann/offline-docs-master
readthedocs: also build offline docs, fixes #7835
2023-09-25 15:23:36 +02:00
Thomas Waldmann
80b08aff35
readthedocs: also build offline docs, fixes #7835 2023-09-25 15:21:50 +02:00
Thomas Waldmann
bd1d734591
docs: removed TAMs, introduce typed repo objects 2023-09-24 20:11:00 +02:00
Thomas Waldmann
d1fde11645
tests: borg check must not add a spoofed archive to manifest
also: do a small optimisation in borg check:

if the type of the repo object is not ROBJ_ARCHIVE_META, we
can skip the object, it can not contain valid archive meta data.

if the type is correct, this is already a sufficient check, so
we can be quite sure that there will be valid archive metadata
in the object.
2023-09-24 20:10:58 +02:00
Thomas Waldmann
6b4697b479
tests: borg check notices/repairs a spoofed manifest 2023-09-24 20:10:57 +02:00