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

3866 commits

Author SHA1 Message Date
enkore
cd1df96ef5 Merge pull request #2171 from ThomasWaldmann/limit-unpacker
borg rpc: use limited msgpack.Unpacker
2017-02-21 21:53:09 +01:00
TW
21884763ac Merge pull request #2183 from ThomasWaldmann/doc-env
document BORG_HOSTNAME_IS_UNIQUE, fixes #2087
2017-02-21 21:38:31 +01:00
enkore
6dd5f0fbec Merge pull request #2187 from ThomasWaldmann/fix-hashindex-contains-bigendian
fix ChunkIndex.__contains__ assertion  for big-endian archs
2017-02-20 09:30:05 +01:00
Thomas Waldmann
8d7dfe739f fix ChunkIndex.__contains__ assertion for big-endian archs
also: add some missing assertion messages

severity:

- no issue on little-endian platforms (== most, including x86/x64)
- harmless even on big-endian as long as refcount is below 0xfffbffff,
  which is very likely always the case in practice anyway.
2017-02-20 07:38:55 +01:00
Thomas Waldmann
4e08bbcf0b document BORG_HOSTNAME_IS_UNIQUE, fixes #2087 2017-02-19 05:12:00 +01:00
Thomas Waldmann
b82f648875 archive check: detect and fix missing all-zero replacement chunks, fixes #2180 2017-02-19 03:05:41 +01:00
enkore
63d4cf4c82 Merge pull request #2172 from Abogical/master
Add dsize and dcsize keys, fixes #2164
2017-02-18 18:24:52 +01:00
Abogical
38e4817b48 Correct calculation of unique chunks 2017-02-18 12:37:28 +02:00
Abogical
cd3cbee962 Refactor unique chunks summing 2017-02-18 12:36:08 +02:00
Thomas Waldmann
6a25b6bdfa update docs about limited msgpack Unpacker for RPC code 2017-02-18 07:15:53 +01:00
Abogical
31f3ddf503 Join the hall of fame 2017-02-17 19:12:01 +02:00
Abogical
6ed0746934 Count non-unique chunks deduplicated sizes 2017-02-17 17:33:04 +02:00
Abogical
59571115a1 Add tests for dsize and dcsize 2017-02-17 15:26:14 +02:00
Abogical
5aa74abedf Add dsize and dcsize keys
These keys shows the amount of deduplicated size and compressed
size of each file in the archive.
2017-02-17 14:28:39 +02:00
Thomas Waldmann
b05893e723 borg rpc: use limited msgpack.Unpacker, fixes #2139
we do not trust the remote, so we are careful unpacking its responses.

the remote could return manipulated msgpack data that announces e.g.
a huge array or map or string. the local would then need to allocate huge
amounts of RAM in expectation of that data (no matter whether really
that much is coming or not).

by using limits in the Unpacker, a ValueError will be raised if unexpected
amounts of data shall get unpacked. memory DoS will be avoided.
2017-02-17 05:44:48 +01:00
enkore
d9fe4a1e2c Merge pull request #2160 from enkore/f/cryptodocs
add "Cryptography in Borg" and "Remote RPC protocol security" sections
2017-02-16 20:27:34 +01:00
Marian Beermann
8e8d9d3f48 docs: add edited "Cryptography in Borg" and "Remote RPC protocol security" sections
The former section is a bit older (Nov 2016) and has been the piece
responsible for finding CVE-2016-10099, since while writing it I
wondered how the manifest was authenticated to actually
*be* the manifest. Well. There it is ;)

It has been edited to final form only recently and should now be ready
for review.

The latter section is new.
2017-02-16 20:27:16 +01:00
enkore
bd2f0210a8 Merge pull request #2167 from enkore/f/faqhier
docs: FAQ by categories as proposed by @anarcat in #1802
2017-02-16 20:19:34 +01:00
enkore
4c7784bf20 Merge pull request #2166 from enkore/issue/2165
init: mandatory --encryption arg
2017-02-16 20:19:07 +01:00
Marian Beermann
caeff71a6c init: mandatory --encryption arg 2017-02-16 19:03:23 +01:00
Marian Beermann
3d79d441a5 faq: update Which file types, attributes, etc. are *not* preserved?
ext4 immutable has been supported for a while.
2017-02-16 16:49:26 +01:00
Marian Beermann
9e0ea92a9d docs: FAQ by categories as proposed by @anarcat in #1802
Usage & Limitations
Security
Common issues
Miscellaneous (only three items, two fork-related)

Note: This does not change any links to FAQ items.
2017-02-16 16:06:15 +01:00
enkore
833d0ab76c Merge pull request #2162 from enkore/f/docs
fix build_xxx
2017-02-15 00:08:49 +01:00
Marian Beermann
4446577dd5 docs: less spacing between options 2017-02-14 23:11:21 +01:00
Marian Beermann
788b608aa9 setup.py build_usage/build_man fixes 2017-02-14 23:02:56 +01:00
enkore
a1ceb16627 Merge pull request #2159 from enkore/issue/2158
create: handle BackupOSError on a per-path level in one spot
2017-02-14 20:40:13 +01:00
Marian Beermann
73990b878f create: handle BackupOSError on a per-path level in one spot 2017-02-14 20:39:29 +01:00
enkore
22464295cf Merge pull request #2156 from enkore/f/devmodel
new branching model
2017-02-14 13:02:33 +01:00
Marian Beermann
5e0c2d4b11 new branching model 2017-02-14 13:01:46 +01:00
enkore
a659d1bf5f Merge pull request #2154 from enkore/merge/1.0-maint
cherry pick changes back from 1.0-maint (one-off)
2017-02-14 01:19:07 +01:00
Alexander 'Leo' Bergolth
30a5c5e44b add two new options --pattern and --patterns-from as discussed in #1406
# Conflicts:
#	src/borg/archiver.py
#	src/borg/helpers.py
#	src/borg/testsuite/helpers.py

Original-Commit: 876b670d
2017-02-13 21:47:51 +01:00
Thomas Waldmann
8d432b01e1 paperkey.html - decode as utf-8, fixes #2150
hardcoded the encoding for reading it. while utf-8 is the default
encoding on many systems, it does not work everywhere.

and when it tries to decode with the ascii decoder, it fails.
2017-02-13 21:24:34 +01:00
Marian Beermann
11318c94dc add paperkey.html to pyinstaller spec 2017-02-13 21:24:34 +01:00
Marian Beermann
44798e0edd setup.py: build_api: sort file list for determinism
# Conflicts:
#	docs/api.rst
#	setup.py

Original-Commit: e208d115
2017-02-13 21:24:33 +01:00
Marian Beermann
1fabb2df58 key export: center QR code on the page 2017-02-13 21:24:33 +01:00
Marian Beermann
04bd6fb013 add test for export key --qr-html 2017-02-13 21:24:33 +01:00
Marian Beermann
79dd920661 update CHANGES (1.0.10)
# Conflicts:
#	docs/changes.rst

Original-Commit: e635f219
2017-02-13 21:24:33 +01:00
Benedikt Heine
2cdb583879 clearify doc for same filesystems
# Conflicts:
#	src/borg/archiver.py

Original-Commit: d3a2f36b03
2017-02-13 21:24:33 +01:00
Martin Hostettler
179f1bc147 Add qr html export mode to key export command 2017-02-13 21:24:33 +01:00
Martin Hostettler
e0f36e8613 quickstart.rst: Add link to paperkey template. 2017-02-13 20:45:49 +01:00
Martin Hostettler
b44882d10c paperkey.html: Add interactive html template for printing key backups. 2017-02-13 20:45:46 +01:00
Martin Hostettler
fb44362c95 Add myself to AUTHORS
# Conflicts:
#	AUTHORS

Original-Commit: bd8be26
2017-02-13 20:45:19 +01:00
Martin Hostettler
32e73e8c7e Manifest: Make sure manifest timestamp is strictly monotonically increasing.
Computer clocks are often not set very accurately set, but borg
assumes manifest timestamps are never going back in time.

Ensure that this is actually the case.

# Conflicts:
#	src/borg/helpers.py

Original-Commit: 6b8cf0a
2017-02-13 20:43:57 +01:00
enkore
ab52ce38f3 Merge pull request #2145 from enkore/f/manpages
manpages part two
2017-02-12 22:55:23 +01:00
Marian Beermann
e4486cd370 fix rST warning in Repository.scan 2017-02-12 18:51:41 +01:00
Marian Beermann
0971fdce8d docs: changes: fix two rST warnings 2017-02-12 18:51:41 +01:00
Marian Beermann
847797b477 update development.rst for docs changes 2017-02-12 18:51:41 +01:00
Marian Beermann
95b69a433c docs: usage: remove not-updated-anymore debug* files. 2017-02-12 18:51:41 +01:00
Marian Beermann
96fa1e8414 docs: define "ours" merge strategy for auto-generated files 2017-02-12 18:51:40 +01:00
Marian Beermann
1d9378f12c man pages: generate page for subparsers, eg. borg-key(1)
Conflicts:
	docs/man/borg-key.1
2017-02-12 15:28:59 +01:00