1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2025-02-23 06:31:58 +00:00
Commit graph

3696 commits

Author SHA1 Message Date
enkore
5f802f3942 Merge pull request #2215 from enkore/f/logjson
Add --log-json option for structured logging output
2017-02-26 16:49:48 +01:00
Marian Beermann
70c11976bc Add --log-json option for structured logging output 2017-02-26 16:25:58 +01:00
enkore
0f9b7a270d Merge pull request #2203 from enkore/f/jsono
JSON output for major commands
2017-02-25 23:05:35 +01:00
enkore
5c46136433 Merge pull request #2210 from enkore/f/rxtx
RemoteRepository: account rx/tx bytes
2017-02-25 22:41:27 +01:00
enkore
e59d313666 Merge pull request #2206 from ThomasWaldmann/fix-location-regex-smb
Location: accept //servername/share/path
2017-02-25 16:11:44 +01:00
enkore
43bb43a271 Merge pull request #2192 from enkore/f/doctoc
Edited + and corrected some stuff in internals+security
2017-02-24 11:55:13 +01:00
Thomas Waldmann
c8ec698d73 Location: accept //servername/share/path 2017-02-24 04:22:12 +01:00
Marian Beermann
4f1db82f6d info <archive>: use Archive.info() for both JSON and human display 2017-02-23 21:39:56 +01:00
Marian Beermann
f3c7e7cd36 RemoteRepository: account rx/tx bytes 2017-02-23 16:50:52 +01:00
Marian Beermann
8cdf192511 list: add "name" key for consistency with info cmd 2017-02-23 15:23:27 +01:00
Marian Beermann
56563a4392 move JSON generation and utilities to helpers 2017-02-23 15:23:27 +01:00
enkore
4862efe718 Merge pull request #2194 from jdchristensen/master
In api decorator, pass wait argument to RemoteRepository.call; fixes …
2017-02-23 14:50:33 +01:00
Marian Beermann
1f8c0929bf list: --json for archive contents listing 2017-02-23 14:28:30 +01:00
Marian Beermann
25781f53d4 list: --json for archive listing 2017-02-23 14:28:15 +01:00
Marian Beermann
6180f5055c info: --json for archives 2017-02-23 14:28:15 +01:00
Marian Beermann
2ab5d0f213 use custom JSON encoder for repr'ing Borg objects consistently 2017-02-23 14:27:52 +01:00
Marian Beermann
7cbade2f8c create: add --json option 2017-02-23 12:00:21 +01:00
Marian Beermann
cc26bdf810 info: add --json option 2017-02-23 11:55:14 +01:00
enkore
e3a8ccdf3b Merge pull request #2197 from enkore/f/info-limits
info: show utilization of maximum archive size
2017-02-23 09:18:04 +01:00
Marian Beermann
b0e4f13fba set MAX_DATA_SIZE = 20971479 bytes in solid stone 2017-02-23 00:34:40 +01:00
Marian Beermann
69f7810658 info: show utilization of maximum archive size
See #1452

This is 100 % accurate.

Also increases maximum data size by ~41 bytes. Not 100 % side-effect free;
if you manage to exactly land in that area then older Borg would not read
it. OTOH it gives us a nice round number there.
2017-02-22 23:47:21 +01:00
Dan Christensen
20a5282a4c In api decorator, pass wait argument to RemoteRepository.call; fixes #2185 2017-02-22 16:26:08 -05:00
Marian Beermann
19d50cff76 docs: internals: move toctree to after the introduction text
this only changes the location on the page, nothing about how the TOC
is arranged.
2017-02-22 15:56:27 +01:00
Marian Beermann
1652525858 docs: clarify metadata kind, manifest ops 2017-02-22 15:29:33 +01:00
Marian Beermann
ecdf6ba25f docs: key enc: correct / clarify some stuff, link to internals/security 2017-02-22 00:21:14 +01:00
Marian Beermann
c03a7ad844 docs: datas: enc: 1.1.x mas different MACs 2017-02-22 00:21:14 +01:00
Marian Beermann
6b21d63086 docs: datas: enc: correct factual error -- no nonce involved there. 2017-02-22 00:21:14 +01:00
Marian Beermann
e5bbba573a docs: make internals.rst an index page
Subsections:

- Security
- Data structures and file formats
2017-02-22 00:21:14 +01:00
Marian Beermann
63f17087c8 docs: edited internals section a bit 2017-02-22 00:13:46 +01:00
TW
268d74bb43 Merge pull request #2181 from ThomasWaldmann/fix-2180
archive check: detect and fix missing replacement chunks, fixes #2180
2017-02-21 21:57:23 +01:00
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