mirror/borg
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2024-12-27 02:08:54 +00:00
Code Issues Releases Wiki Activity
7123 commits 9 branches 139 tags 61 MiB
Commit graph

7123 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thomas Waldmann
c3345fe423 remove remainders of borg key migrate-to-repokey 2022-08-03 21:48:55 +02:00
Thomas Waldmann
78230dd299 docs: key: fix keyfile mode in example 2022-08-03 18:46:50 +02:00
Thomas Waldmann
17e75f3eea docs: transfer: talk of "related repo" 2022-08-03 18:33:02 +02:00
Thomas Waldmann
bcd7ab3dec docs: rcreate: explain "related repo" 2022-08-03 18:20:10 +02:00
TW
630097a99f
Merge pull request #6922 from ThomasWaldmann/one-crypt-key 
Key: crypt_key instead of enc_key + enc_hmac_key, fixes #6611
 2022-08-03 14:58:16 +02:00
Thomas Waldmann
d5df53732d increase Key.version to 2 
Old borg (< 2.0) can not read/process the new keys that have crypt_key instead of enc_key and enc_hmac_key.
 2022-08-03 12:25:58 +02:00
Thomas Waldmann
3ee69bc7ba Key: crypt_key instead of enc_key + enc_hmac_key, fixes #6611 2022-08-03 12:04:23 +02:00
TW
3794a3a9dc
Merge pull request #6923 from ThomasWaldmann/update-docs-master 
update docs
 2022-08-03 11:54:43 +02:00
Thomas Waldmann
89e4a52c56 docs: misc. updates 
- remove outdated stuff
- fix infos for borg 2.0
 2022-08-03 11:35:25 +02:00
TW
b0480a06d6
Merge pull request #6915 from horazont/docs/internal-details-master 
docs(master): provide more details on object layout
 2022-08-01 22:53:39 +02:00
TW
7fde480719
Merge pull request #6921 from ThomasWaldmann/new-ae-key 
rcreate --copy-ae-key: copy AE key from key of other repo, fixes #6710
 2022-08-01 15:30:58 +02:00
TW
1744c92967
Merge pull request #6919 from ThomasWaldmann/fix-delete-master 
delete: remove unused option --keep-security-info
 2022-08-01 15:12:06 +02:00
Thomas Waldmann
9878956140 rcreate --copy-ae-key: copy AE key from key of other repo, fixes #6710 
default: create new, random authenticated encryption key.
 2022-08-01 14:57:30 +02:00
TW
7222574214
Merge pull request #6920 from ThomasWaldmann/transfer-check-related 
transfer: check whether ID hash method and chunker secret are same
 2022-08-01 13:56:08 +02:00
Thomas Waldmann
a8dda5cb0c transfer: check whether ID hash method and chunker secret are same, fixes #6893 
also: add PlaintextKey and AuthenticatedKey support to uses_same_id_hash function.
 2022-08-01 13:27:47 +02:00
Thomas Waldmann
2c2afe4123 delete: remove unused option --keep-security-info 
this option is only useful for deleting repos.
 2022-08-01 11:41:39 +02:00
Jonas Schäfer
33b846e292 docs: update encryption drawing for new compression bytes 
Since compression type identification has been split into type and
level, the graphic needed a slight update.

Unfortunately, I don't have access to Visio, so I converted this to odg.
 2022-07-30 19:24:26 +02:00
Jonas Schäfer
c8ab490017 docs: provide more details on object layout 
While writing my own out-of-band decoder, I had a hard time figuring out
how to unpack the manifest. From the description, I was only able to
read that the manifest is msgpack'd, but I had not been able to figure
out that it's also going through the same encryption+compression logic
as all other things do.

This should make it a little clearer and provide the necessary
information to understand how the compression works.
 2022-07-30 19:24:26 +02:00
TW
c5a594688a
Merge pull request #6913 from ThomasWaldmann/prune-checkpointing-master 
prune/delete --checkpoint-interval=1800 and ctrl-c/SIGINT support
 2022-07-30 17:51:22 +02:00
Thomas Waldmann
0deb4352c1 prune/delete --checkpoint-interval=1800 and ctrl-c/SIGINT support, fixes #6284 
manifest, repo and cache are committed every checkpoint interval.

also, when ctrl-c is pressed, finish deleting the current archive, commit and then terminate.
 2022-07-30 17:24:40 +02:00
TW
762581a667
Merge pull request #6907 from ThomasWaldmann/fix-flags-formatting-master 
list: fix {flags:<WIDTH>} formatting, fixes #6081
 2022-07-30 15:32:34 +02:00
TW
2a4cf7c068
Merge pull request #6903 from ThomasWaldmann/fix-5719-master 
check: try harder to create the key, fixes #5719
 2022-07-30 15:29:47 +02:00
Thomas Waldmann
15cb54f623 list: fix {flags:<WIDTH>} formatting, fixes #6081 
item.bsdflags is either not present or an int, thus we default to 0 (== no flags) if not present.
 2022-07-29 10:44:37 +02:00
Thomas Waldmann
53830ecae9 check: try harder to create the key, fixes #5719 
the old code did just 1 attempt to detect the repo decryption key.
if the first chunkid we got from the chunks hashtable iterator was accidentally
the id of the chunk we intentionally corrupted in test_delete_double_force,
setup of the key failed and that made the test crash.

in practice, this could of course also happen if chunks are corrupted, thus
we now do many retries with other chunks before giving up.

error handling was improved: do not return None (instead of a key), it just
leads to weird crashes elsewhere, but fail early with IntegrityError and a
reasonable error msg.

rename method to make_key to avoid confusion with borg.crypto.key.identify_key.
 2022-07-29 10:34:58 +02:00
TW
e7c2506a7f
Merge pull request #6895 from ThomasWaldmann/ci-macos-master 
CI: test on macOS 12 without fuse / fuse tests
 2022-07-28 00:09:50 +02:00
Thomas Waldmann
ba1a26ffa5 CI: test on macOS 12 without fuse / fuse tests 
too troublesome on github CI due to kernel extensions needed by macFUSE.
 2022-07-27 22:31:06 +02:00
TW
61e8d9518b
Merge pull request #6784 from borgbackup/borg2 
borg 2
 2022-07-27 16:09:34 +02:00
Thomas Waldmann
ad7c7159b2 Merge branch 'master' into borg2 2022-07-27 13:49:50 +02:00
remyabel2
ddb805cd10
docs: add info on man page installation (#6888) 
docs: add info about man page installation, fixes #6661
 2022-07-27 12:48:27 +02:00
TW
19509f5fa5
Merge pull request #6889 from ThomasWaldmann/archive-progress-json-docs-master 
docs: update archive_progress json description about "finished"
 2022-07-27 12:47:12 +02:00
Thomas Waldmann
c7e719f209 docs: update archive_progress json description about "finished", see #6570 2022-07-25 13:05:16 +02:00
TW
a75b260fef
Merge pull request #6884 from a1346054/fixes 
Fix typos and shellcheck warnings
 2022-07-23 21:44:27 +02:00
Thomas Waldmann
dfbf638a5b Merge branch 'master' into borg2 2022-07-23 21:21:41 +02:00
a1346054
41d67bc449
fix shellcheck warnings in bash scripts 2022-07-22 15:52:04 +00:00
a1346054
160dd877ab
fix typos 2022-07-22 15:51:46 +00:00
TW
320190dacf
Merge pull request #6880 from ThomasWaldmann/new-crypto-no-assert-id-borg2 
new crypto does not need to call ._assert_id()
 2022-07-21 20:44:21 +02:00
Thomas Waldmann
b0db800b5a check: --verify-data does not need to decompress with new crypto modes 2022-07-20 15:51:33 +02:00
Thomas Waldmann
9d6c98d9f9 docs: remove _assert_id() call for new crypto 2022-07-20 14:31:37 +02:00
Thomas Waldmann
f82f123b56 new crypto does not need to call ._assert_id() 
https://github.com/borgbackup/borg/pull/6463#discussion_r925436156
 2022-07-20 14:13:25 +02:00
TW
b52781a999
Merge pull request #6876 from LocutusOfBorg/fix-template 
Fix pyproject.toml to create a fixed _version.py file, compatible wi…
 2022-07-18 19:42:32 +02:00
Gianfranco Costamagna
a92c156e05 Fix pyproject.toml to create a fixed _version.py file, compatible with both old and new setuptools_scm version (see: #6875) 2022-07-18 18:56:59 +02:00
TW
0037375148
Merge pull request #6869 from ThomasWaldmann/rel200a4 
release 2.0.0a4
 2022-07-17 16:03:45 +02:00
Thomas Waldmann
357aa5241b build_usage / build_man 2022-07-17 09:23:06 +02:00
TW
d9f72b6ed2
Merge pull request #6866 from ThomasWaldmann/update-changes-borg2 
update CHANGES
 2022-07-17 08:48:14 +02:00
Thomas Waldmann
32a7896573 update CHANGES 2022-07-16 23:16:39 +02:00
TW
17e74caccd
Merge pull request #6864 from ThomasWaldmann/remove-tilde-otheruser-borg2 
ssh:// URLs: remove support for /~otheruser/, see #6855
 2022-07-16 18:53:28 +02:00
Thomas Waldmann
47c2672a64 ssh:// URLs: remove support for /~otheruser/, see #6855 
If you used this, just replace it by:

ssh://user@host:port/home/otheruser/
 2022-07-15 16:02:45 +02:00
TW
65703df839
Merge pull request #6862 from ThomasWaldmann/mypy-borg2 
add mypy
 2022-07-15 15:23:07 +02:00
Thomas Waldmann
b8e48c5036 mypy: fixes / annotations 2022-07-15 14:54:48 +02:00
Thomas Waldmann
366ef73f88 mypy: rename yes module to yes_no to avoid name collision 2022-07-15 14:46:18 +02:00