Commit Graph

2957 Commits

Author SHA1 Message Date
Marian Beermann 93efd2dca4 docs: quickstart: delete problematic BORG_PASSPRHASE use
(cherry picked from commit aa7fbff55f)
2017-06-26 03:21:02 +02:00
Thomas Waldmann f7b16112dc move get_limited_unpacker to helpers
also: move some constants to borg.constants
(cherry picked from commit 89f3cab6cd)
2017-06-26 03:12:12 +02:00
Thomas Waldmann 35b0f1f4f9 Manifest: use limited unpacker
(cherry picked from commit 6c2c51939d)
2017-06-26 02:25:20 +02:00
Marian Beermann 10b196d532 document pattern denial of service
(cherry picked from commit 1f5ddb6572)
2017-06-26 01:56:14 +02:00
edgewood 932fb9ec7a Split up parsing and filtering for --keep-within (#2726)
Split up parsing and filtering for --keep-within

Fixes #2610

Parse --keep-within argument early, via new method within_range passed
to argparse type=, so that better error messages can be given.

Also swallows ValueError stacktrace per the comment in the old code that
including it wasn't desirable.
2017-06-25 23:31:04 +02:00
TW 04aa426334 Merge pull request #2722 from ThomasWaldmann/backports5
even more backports
2017-06-23 16:24:33 +02:00
Thomas Waldmann e64d177b3a travis: install fakeroot for Linux
they removed it from the preinstalled sw stack.

(cherry picked from commit b625a4c8c5)
2017-06-22 20:47:25 +02:00
TW 60242d7f0f Merge pull request #2724 from ThomasWaldmann/backport-remove-hurd-skip
remove skipping the noatime tests on GNU/Hurd, fixes #2710
2017-06-22 01:51:41 +02:00
Thomas Waldmann 8deb4dfdda remove skipping the noatime tests on GNU/Hurd, fixes #2710
I recently installed GNU/Hurd 2017 and found the atime test works now.

(cherry picked from commit 49411d1c6c)
2017-06-22 01:03:32 +02:00
Marian Beermann 12b2e1fdd0 chunker: fix invalid use of types
With the argument specified as unsigned char *, Cython emits
code in the Python wrapper to convert string-like objects to
unsigned char* (essentially PyBytes_AS_STRING).

Because the len(data) call is performed on a cdef'd string-ish type,
Cython emits a strlen() call, on the result of PyBytes_AS_STRING.

This is not correct, since embedded null bytes are entirely possible.

Incidentally, the code generated by Cython was also not correct,
since the Clang Static Analyzer found a path of execution where
passing arguments in a weird way from Python resulted in strlen(NULL).

Formulated like this, Cython emits essentially:

c_buzhash(
 PyBytes_AS_STRING(data),
 PyObject_Length(data),
 ...
)

which is correct.

(cherry picked from commit faf2d0b537)
2017-06-21 15:31:33 +02:00
Marian Beermann 3bd71c63f9 chunker: don't do uint32_t >> 32
(cherry picked from commit 944a4abd58)
2017-06-21 15:31:01 +02:00
Thomas Waldmann 10b8cd9218 use stat with follow_symlinks=False
should be equivalent to using os.lstat() before.

(cherry picked from commit efec00b39c)
2017-06-21 15:16:43 +02:00
Thomas Waldmann 2b3932cac6 require and use chown with follow_symlinks=False
should be equivalent to using os.lchown() before.

(cherry picked from commit 094376a8ad)
2017-06-21 14:58:17 +02:00
Thomas Waldmann 8857422035 document follow_symlinks requirements, check libc, fixes #2507
(cherry picked from commit b484c79bc2)
2017-06-21 14:57:22 +02:00
TW 4689c041a8 Merge pull request #2719 from ThomasWaldmann/backports4
More backports
2017-06-21 14:02:32 +02:00
TW 4068006de8 Merge pull request #2717 from ThomasWaldmann/backports3
backports
2017-06-21 14:02:09 +02:00
Thomas Waldmann 961a2587dc FUSE: fix negative uid/gid crash, fixes #2674
they could come into archives e.g. when backing up
external drives under cygwin.

(cherry picked from commit ccd066f0af)
2017-06-21 03:15:22 +02:00
Thomas Waldmann 34a821178f don't write to disk with --stdout, fixes #2645
if we always give stdout to extract_item(), it gets into the stdout-
processing branch which only emits data from items that have chunks
and does nothing for items which don't.

(cherry picked from commit 0b00c14c27)
2017-06-21 03:05:03 +02:00
Thomas Waldmann 7846ef2e69 remove attic dependency of the tests, fixes #2505
attic.tar.gz contains a repo + corresponding keyfile - all the
upgrader module tests need.

.tar.gz because the .tar was 20x bigger.

(cherry picked from commit fed5873e29)
2017-06-21 03:00:52 +02:00
Marian Beermann aafbaaea20 cache sync: check Operation.READ compatibility with manifest
(cherry picked from commit c9c227f2ca)
2017-06-21 00:53:49 +02:00
philippje f864f6bc47 changed the date of day without backup
Changed from 20. December to 19. December for easier comprehension (viewing the calendar.)
The missing 'd' at 20. December is hardly noticeable compared to e.g. the 19. December.
(cherry picked from commit 88e937d0f9)
2017-06-21 00:51:59 +02:00
Thomas Waldmann 0b46c0d192 enable remote tests on cygwin
the cygwin issue that caused these tests to break was fixed in cygwin
at least since cygwin 2.8.0 (maybe even since 2.7.0).

also added a comment to our workaround (os_write wrapper, that is needed
still for people running older cygwin versions) that it can be removed
when cygwin 2.8.0 is considered ancient (and everybody has upgraded to
some fixed version).

(cherry picked from commit 4766d66875)
2017-06-21 00:49:29 +02:00
Steve Groesz b40e819363 Add bountysource badge (at right), fixes #2558
(cherry picked from commit a9aab705cc)
(cherry picked from commit 6571cb1726)
2017-06-21 00:46:21 +02:00
edgimar de2dd9f23c Update changes.rst
fix denglish
(cherry picked from commit b57fb1a5e5)
2017-06-21 00:43:15 +02:00
Marian Beermann 1de042f9e5 key file names: limit to 100 characters (not bytes)
(cherry picked from commit 38ed9a20af)
2017-06-21 00:39:24 +02:00
Marian Beermann 649afe0c17 key file names: remove colons from host name
(cherry picked from commit 4b8a04b5e7)
2017-06-21 00:37:46 +02:00
enkore d67597a11e Create empty docs.txt reequirements (see #2694) 2017-06-18 01:46:59 +02:00
textshell 41193eac51 Merge pull request #2134 from textshell/feature/mandatory-features
Add minimal version of in repository mandatory feature flags.
2017-06-09 22:11:06 +02:00
Martin Hostettler 6ce476a42b Add tests for cache compatibility code. 2017-06-08 21:38:59 +02:00
Martin Hostettler fb128fbf84 Cache: Wipe cache if compatibility is not sure
Add detection of possibly incompatible combinations
of the borg versions maintaining the cache and the featues used.
2017-06-08 20:36:56 +02:00
Martin Hostettler 7f57086223 permit manifest version 2 as well 1 one. 2017-06-08 20:36:55 +02:00
Martin Hostettler ca5ea4f53d Add tests for mandatory repository feature flags. 2017-06-08 20:36:55 +02:00
Martin Hostettler 8783460fc3 Add minimal version of in repository mandatory feature flags.
This should allow us to make sure older borg versions can be cleanly
prevented from doing operations that are no longer safe because of
repository format evolution. This allows more fine grained control than
just incrementing the manifest version. So for example a change that
still allows new archives to be created but would corrupt the repository
when an old version tries to delete an archive or check the repository
would add the new feature to the check and delete set but leave it out
of the write set.

This is somewhat inspired by ext{2,3,4} which uses sets for
compat (everything except fsck), ro-compat (may only be accessed
read-only by older versions) and features (refuse all access).
2017-06-08 20:36:54 +02:00
enkore 3a5ae844a1 Merge pull request #2559 from enkore/bp2
Backports for 1.0.11
2017-05-23 16:24:27 +02:00
Thomas Waldmann 73dea37432 use _host to store host/ipv4/ipv6
for ipv6, it includes the outer square brackets.

the host property strips any outer square brackets.
2017-05-23 15:31:08 +02:00
Benedikt Neuffer 97c770e318 ipv6 address support
also: Location: more informative exception when parsing fails
2017-05-23 15:31:04 +02:00
Thomas Waldmann 93a7c82d84 README: how to help the project 2017-05-23 15:28:16 +02:00
Marian Beermann d9681c6b15 fuse: fix crash if empty (None) xattr is read 2017-05-23 15:27:39 +02:00
Marian Beermann fa9cef7abf mount: do pre-mount checks before opening repository 2017-05-23 15:26:12 +02:00
Marian Beermann 450146e6ca mount: check llfuse is installed before asking for passphrase 2017-05-23 15:25:41 +02:00
enkore ecf45d33bc Merge pull request #2545 from enkore/issue/2542
note -v/--verbose requirement on affected options
2017-05-21 17:19:31 +02:00
Marian Beermann 8ca7faaf1e note -v/--verbose requirement on affected options
This is fixed in 1.1.
2017-05-21 16:55:19 +02:00
enkore 6f3a9f8ba9 Merge pull request #2512 from enkore/issue/2463
Remove patterns from 1.0-maint branch
2017-05-16 19:42:29 +02:00
Marian Beermann 1c6cefbee7 Revert "Merge pull request #1971 from leo-b/1.0-maint-patterns"
This reverts commit d188886269, reversing
changes made to c688b1be85.

# Conflicts:
#	borg/archiver.py
2017-05-15 23:41:09 +02:00
Marian Beermann 6335d593ab Revert "Merge pull request #2231 from leo-b/1.0-maint-patterns"
This reverts commit 9a5bc514b3, reversing
changes made to 8b5ad3819c.
2017-05-15 23:38:17 +02:00
Marian Beermann 173ecfddb4 Revert "Merge pull request #2401 from ThomasWaldmann/patterns-style-default-1.0"
This reverts commit 7a4e9e7a6f, reversing
changes made to b007808706.
2017-05-15 23:37:28 +02:00
TW 967a40dcdb Merge pull request #2464 from ThomasWaldmann/limit-y2038-1.0
embrace y2038 issue to support 32bit platforms (1.0-maint)
2017-04-30 00:19:37 +02:00
Thomas Waldmann 6a929c689e embrace y2038 issue to support 32bit platforms
(cherry picked from commit de76a6b821)
2017-04-29 23:56:53 +02:00
enkore 939855af79 Merge pull request #2456 from ThomasWaldmann/doc-updates-backports-1.0
doc updates backported to 1.0
2017-04-28 22:09:31 +02:00
enkore 3451135536 Merge pull request #2457 from ThomasWaldmann/beyond-repair-1.0
be more clear that this is a "beyond repair" case, fixes #2427
2017-04-28 22:09:10 +02:00