text attributes: validate more strictly, fixes #2290 #7197
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ThomasWaldmann
force-pushed
the
valid-archive-names
branch
2 times, most recently
from
901a82e
to
e2be00d
Compare
Codecov Report
@@ Coverage Diff @@
## master #7197 +/- ##
==========================================
- Coverage 83.52% 83.50% -0.03%
==========================================
Files 67 67
Lines 11486 11540 +54
Branches 2078 2090 +12
==========================================
+ Hits 9594 9636 +42
- Misses 1343 1354 +11
- Partials 549 550 +1
Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. |
ThomasWaldmann
force-pushed
the
valid-archive-names
branch
from
e2be00d
to
9001f26
Compare
we want to be able to use an archive name as a directory name,
e.g. for the FUSE fs built by borg mount.
thus we can not allow "/" in an archive name on linux.
on windows, the rules are more restrictive, disallowing
quite some more characters (':<>"|*?' plus some more).
we do not have FUSE fs / borg mount on windows yet, but
we better avoid any issues.
we can not avoid ":" though, as our {now} placeholder
generates ISO-8601 timestamps, including ":" chars.
also, we do not want to have leading/trailing blanks in
archive names, neither surrogate-escapes.
control chars are disallowed also, including chr(0).
we have python str here, thus chr(0) is not expected in there
(is not used to terminate a string, like it is in C).
ThomasWaldmann
force-pushed
the
valid-archive-names
branch
from
9001f26
to
ebff12a
Compare
ThomasWaldmann
commented
Dec 12, 2022
Comment on lines
+546
to
+551
| MAX_PATH = 260 # Windows default. Since Win10, there is a registry setting LongPathsEnabled to get more. | ||
| MAX_DIRNAME = MAX_PATH - len("12345678.123") | ||
| SAFETY_MARGIN = 48 # borgfs path: mountpoint / archivename / dir / dir / ... / file | ||
| MAX_ARCHIVENAME = MAX_DIRNAME - SAFETY_MARGIN | ||
| if not (0 < len(text) <= MAX_ARCHIVENAME): | ||
| raise argparse.ArgumentTypeError(f'Invalid archive name: "{text}" [0 < length <= {MAX_ARCHIVENAME}]') |
There was a problem hiding this comment.
Since we can not rely on LongPathsEnabled and we also need some (48) chars for the mountpoint and path components inside the archivename directory, we are now down to 200 chars max for the archivename.
not needed any more as the comment is now validated pure text.
not needed any more as the archive name is now validated pure text.
this needs to get done differently later, maybe base64 for json output.
ThomasWaldmann
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
also: kill the
b*(bpath, barchive, bcomment) stuff.