1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2024-12-26 01:37:20 +00:00
Commit graph

2928 commits

Author SHA1 Message Date
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
Thomas Waldmann
c12bcff30f work around fuse xattr test issue with recent fakeroot
fakeroot >= 1.20.2 "supports" xattrs, but this support somehow leads to the fuse tests not seeing
the xattrs in fuse, because the file visible in the fuse mount was not created via fakeroot.
2016-08-25 02:09:04 +02:00
Marian Beermann
b5d7f1df26 extract: fix incorrect progress output for hard links
this produces correct output if any (non proper) subset of hardlinks are
extracted.
2016-08-25 01:12:30 +02:00
TW
17bd6e0ef4 Merge pull request #1525 from textshell/fix/remote-manual-ssh
borg serve throws exception while trying to close when it gets eof at start
2016-08-24 14:09:06 +02:00
Martin Hostettler
549be2129a RepositoryServer: Add error message when connection was closed before opening repo. 2016-08-24 08:32:04 +02:00
Martin Hostettler
79de73685b remote: Change exception message for unexpected RPC data format to indicate dataflow direction
don't print stacktraces to clean up error messages when sshing into a forces command to borg serve.
2016-08-24 08:31:09 +02:00
TW
316ad336c7 Merge pull request #1523 from ThomasWaldmann/use-prebuilt-bootloader
Vagrant: pyinstaller: use pre-built linux bootloaders, fixes #1506
2016-08-24 00:24:33 +02:00
TW
b403a111fe Merge pull request #1530 from ThomasWaldmann/simplify-repo-tests
Simplify repo/hashindex tests
2016-08-23 22:33:15 +02:00
Thomas Waldmann
93517ca30e hashindex tests: use H(x) instead of some similar constructs
note: hash values needed updating because H(x) formats differently.
2016-08-23 21:29:40 +02:00
Thomas Waldmann
0da0914955 repo tests: use H(x) instead of some similar constructs 2016-08-23 21:29:40 +02:00
Thomas Waldmann
ddb1c60964 repo tests: use H(x) instead of byte literals 2016-08-23 21:29:40 +02:00
TW
d938cf44d7 Merge pull request #1529 from svx/1.0-maint
Addjust border color
2016-08-23 15:19:26 +02:00
sven
248ccf0149 Update borg.css 2016-08-23 15:01:39 +02:00
TW
a54205d696 Merge pull request #1528 from svx/master
Addjust border color
2016-08-23 14:55:56 +02:00
sven
ff04c059b7 Addjust border color
This changes the border-color to match with the background-color
2016-08-23 14:27:26 +02:00
Martin Hostettler
b845a074cb tests: TestBuildFilter: Adjust from item_is_hardlink_master to peek_and_store_hardlink_masters. 2016-08-22 23:36:43 +02:00
Martin Hostettler
a026febdb0 Archiver.build_filter: strip_components is no longer a optional parameter. 2016-08-22 23:07:38 +02:00
Martin Hostettler
972392e290 extract: When doing a partial restore don't leak prefetched chunks.
The filter function passed to iter_items (with preload=True) may never return True for items that
are not really extracted later because that would leak prefetched items.

For restoring hard linked files the item containing the actual chunks might not be matched
or implicitly removed from the restore by strip_components. For this reason the chunk list or all
items that can potentially be used as hardlink target needs to be stored.

To achive both requirements at the same time the filter function needs to store the needed information
for the hardlinks while not returning True just because it could be a hardlink target.

Known problems: When using progress indication the calculated extracted_size now can be smaller
than the actual extracted size in presence of hard links (master is not restored) instead of
bigger (potential master not used in restore).
2016-08-22 22:58:58 +02:00
Martin Hostettler
484c091c62 RepositoryServer: Don‘t try to close the repository if it was not yet opened. 2016-08-22 19:48:39 +02:00
Thomas Waldmann
2cfd905347 Vagrant: pyinstaller: use pre-built linux bootloaders, fixes #1506 2016-08-22 18:49:03 +02:00
TW
e0b8635098 Merge pull request #1521 from ThomasWaldmann/fix-coverage
fix .coverage processing
2016-08-22 01:37:43 +02:00
Thomas Waldmann
85311f0116 fix .coverage processing 2016-08-22 01:15:03 +02:00
enkore
3f5f27fbfe Merge pull request #1520 from ThomasWaldmann/merge-1.0-maint
Merge 1.0 maint
2016-08-22 00:36:13 +02:00