1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2024-12-25 17:27:31 +00:00
Commit graph

2950 commits

Author SHA1 Message Date
Thomas Waldmann
1287d1ae92 Merge branch '1.0-maint' into merge-1.0-maint
# Conflicts:
#	docs/development.rst
#	src/borg/archive.py
#	src/borg/archiver.py
#	src/borg/hashindex.pyx
#	src/borg/testsuite/hashindex.py
2016-09-14 02:53:41 +02:00
TW
b3fac01683 Merge pull request #1595 from ThomasWaldmann/update-wheezy-box
update wheezy vagrant box to 7.11
2016-09-14 02:26:17 +02:00
Thomas Waldmann
3c3502a9a0 update wheezy vagrant box to 7.11
7.9 is not available any more.
2016-09-14 02:22:46 +02:00
enkore
8a62b16ecf Merge pull request #1594 from julian-klode/bugfix/sighup
Handle SIGHUP for proper unlock on lost connection, fixes #1593
2016-09-13 23:54:08 +02:00
Julian Andres Klode
c8f4e9e34c Correctly exit with proper unlock on SIGHUP, fixes #1593
If the connections hangs up, the borg server needs to clean
up, especially unlock the repository, so a later try will
work again.

This is especially problematic with systemd systems that have
KillUserProcesses enabled (which is the default): Logind sends
a SIGHUP message to the session scope when the session ends.
2016-09-13 22:01:28 +02:00
enkore
3714be0d79 Merge pull request #1581 from enkore/issue/1580
hashindex: export max load factor to Python-space
2016-09-09 19:31:22 +02:00
Marian Beermann
be3616b6b3 ArchiveChecker: use MAX_LOAD_FACTOR constant 2016-09-09 16:11:06 +02:00
enkore
142079f3cb Merge pull request #1585 from enkore/issue/1584
create --read-special fix crash on broken symlink
2016-09-08 23:53:51 +02:00
TW
6ff1f6257e Merge pull request #1567 from ThomasWaldmann/improve-dev-docs
contribution guidelines
2016-09-08 20:22:43 +02:00
Thomas Waldmann
b2e389e0a0 docs: add contribution guidelines 2016-09-08 19:40:32 +02:00
Marian Beermann
f1cf7bc322 process_symlink: fix missing backup_io()
Fixes a chmod/chown/chgrp/unlink/rename/... crash race between getting dirents
and dispatching to process_symlink.
2016-09-08 16:43:48 +02:00
Marian Beermann
4cb3355d90 create --read-special fix crash on broken symlink
also correctly processes broken symlinks. before this regressed to a crash
(5b45385) a broken symlink would've been skipped.
2016-09-08 16:39:44 +02:00
Marian Beermann
197552526f hashindex: make MAX_VALUE a class constant 2016-09-07 16:10:10 +02:00
Marian Beermann
9fe0140d94 hashindex: export max load factor to Python-space 2016-09-07 16:08:07 +02:00
TW
b1d3a39a63 Merge pull request #1577 from enkore/issue/1576
Fix second block in "Easy to use" section not showing on GitHub
2016-09-06 13:58:51 +02:00
Marian Beermann
ac8d65cc47 Fix second block in "Easy to use" section not showing on GitHub
Fixes #1576
2016-09-06 13:03:59 +02:00
enkore
84e34a7676 Merge pull request #1568 from ThomasWaldmann/bestpractices-badge
add bestpractices badge
2016-09-04 17:55:28 +02:00
Thomas Waldmann
45d72722af add bestpractices badge 2016-09-03 21:11:47 +02:00
enkore
a6fe69cb80 Merge pull request #1566 from ThomasWaldmann/improve-docs
misc docs improvements
2016-09-03 19:52:11 +02:00
Thomas Waldmann
f70008238a link reference docs and faq about BORG_FILES_CACHE_TTL, fixes #1561 2016-09-03 19:23:59 +02:00
Thomas Waldmann
2c5b8d690b improve borg info --help, explain size infos, fixes #1532 2016-09-03 19:23:58 +02:00
Thomas Waldmann
2e1cf17dd5 add release signing key / security contact to README, fixes #1560 2016-09-03 19:23:40 +02:00
enkore
d3cea7018c Merge pull request #1558 from ThomasWaldmann/improve-fuse
Improve fuse
2016-09-01 21:49:10 +02:00
Thomas Waldmann
dd89181062 fuse: refactor / optimize process_inner 2016-09-01 06:26:33 +02:00
Thomas Waldmann
6f50cc3413 fuse: simplify path segments loop 2016-09-01 05:18:10 +02:00
Thomas Waldmann
d64ccff1c4 fuse: remove unneeded function definition
code only had 1 caller, so just inline it.
2016-09-01 04:57:11 +02:00
Thomas Waldmann
34eb475463 fuse: remove unneeded safe_encode
fsencode will happen in _find_inode()
2016-09-01 04:33:42 +02:00
Thomas Waldmann
8b5372b54c fuse: slightly refactor shadowing detection
if it is not a directory, the old code was a NOP, so we can just check that first.
2016-09-01 04:30:55 +02:00
Thomas Waldmann
83c99943c3 ran build_usage 2016-08-28 00:17:24 +02:00
Thomas Waldmann
6dd29cfb1e ran build_api, reorder as in 1.0 2016-08-28 00:16:19 +02:00
Thomas Waldmann
3f159ba18a update CHANGES 2016-08-28 00:03:16 +02:00
TW
e0bb4a4468 Merge pull request #1129 from ThomasWaldmann/fuse-versions-view
FUSE versions view, fixes #729
2016-08-27 23:51:07 +02:00
Thomas Waldmann
1f04820d9d fuse: implement versions view
all archives, all items are read to build a unified view.
files are represented by a same-name directory with the versions of the file.
A filename suffix computed by adler32(chunkids) is used to disambiguate the versions.

also: refactor code a little, create methods for leaves, inner nodes.
2016-08-27 23:17:57 +02:00
enkore
1219ba5f50 Merge pull request #1537 from enkore/changes/1.1b1
update changes
2016-08-27 22:43:55 +02:00
Marian Beermann
e0b9aede29 update changes (1.1.0b1) 2016-08-27 22:43:41 +02:00
enkore
69c51f268d Merge pull request #1374 from textshell/issue/1039-aes-iv
Fix AES-CTR nonce reusage
2016-08-27 15:52:21 +02:00
Martin Hostettler
620f505a14 Reserve nonce space for AES-CTR before using it.
Reusing the nonce totally breaks AES-CTR confidentiality.

This code uses a reservation of nonce space and stores the next nonce available for
a future reservation on the client and in the repository.

Local storage is needed to protect against evil repositories that try to gain access to
encrypted data by not saving nonce reservations and aborting the connection or otherwise
forcing a rollback.

Storage in the repository is needed to protect against another client writing to the
repository after a transaction was aborted and thus not seeing the last used nonce from
the manifest.

With a real counter mode cipher protection for the multiple client case with an actively
evil repository is not possible. But this still protects against cases where the attacker can
not arbitrarily change the repository but can read everything stored and abort connections
or crash the server.

Fixes #22
2016-08-27 15:31:50 +02:00
enkore
75f6c95e1c Merge pull request #1540 from enkore/f/recreate-autocmt
recreate: fix crash if recompress and deduplication beyond autocommit…
2016-08-27 14:52:41 +02:00
Marian Beermann
e4e6787906 recreate: fix crash if recompress and deduplication beyond autocommit_threshold
ie. it means that if all the recompressed chunks were already in the repo
no data would be written, so there would be no active txn, so failure
ensues.
2016-08-27 14:31:57 +02:00
enkore
e60ed80433 Merge pull request #1539 from enkore/f/recreate-cp
recreate: fix crash if archive doesn't have chunker_params
2016-08-27 14:06:32 +02:00
Marian Beermann
e289fb3539 recreate: fix crash if archive doesn't have chunker_params 2016-08-27 14:01:28 +02:00
enkore
1d750e802e Merge pull request #1536 from enkore/f/prip2
ProgressIndicatorPercent / extract minor cosmetic enhancement
2016-08-27 00:36:43 +02:00
TW
168ce1dc86 Merge pull request #1535 from ThomasWaldmann/merge-1.0-maint
Merge 1.0 maint
2016-08-27 00:32:40 +02:00
Marian Beermann
f0a32575a5 extract: --progress: no extra line for 'Calculating size' 2016-08-26 22:15:44 +02:00
Marian Beermann
517ccc2d58 ProgressIndicatorPercent: output(message) to override output 2016-08-26 22:15:29 +02:00
enkore
47404dfde5 Merge pull request #1526 from textshell/fix/preload-leak-hardlink
extract: When doing a partial restore don't leak prefetched chunks.
2016-08-26 22:06:48 +02:00
Thomas Waldmann
25fa443d2b repo tests: convert some more byte literals to H(x) 2016-08-26 20:59:22 +02:00
Thomas Waldmann
1974824595 Merge branch '1.0-maint' 2016-08-26 20:47:23 +02:00
Marian Beermann
cd39ccb821 fix overeager storing of hardlink masters
n.b. we only need to store them for items that we wouldn't extract.

this also fixes an intersting edge case in extracting hard links
with --strip-components
2016-08-25 21:16:20 +02:00
TW
a6620f020e Merge pull request #1531 from ThomasWaldmann/fix-fuse-xattr-fakeroot
work around fuse xattr test issue with recent fakeroot
2016-08-25 02:09:52 +02:00