JSON API: make sure, strings are valid UTF8#1922
Merged
BareosBot merged 3 commits intobareos:masterfrom Nov 19, 2024
Merged
Conversation
Member
Author
|
As it requires an extra CPM package, we wait until CPM handling is defined. |
arogge
reviewed
Oct 29, 2024
Comment on lines
+42
to
+60
|
|
||
| cpmfindpackage( | ||
| NAME utf8cpp VERSION 4.0.4 GITHUB_REPOSITORY nemtrif/utfcpp EXCLUDE_FROM_ALL | ||
| YES | ||
| ) |
Member
There was a problem hiding this comment.
Using CPMAddPackage() will do the right thing (and will be detected by cmake-format, too). Giving 3.2.1 as the version should use the locally available package on Debian 12 and Ubuntu 22/24. Giving the GIT_TAG will select that tag if no package was found with find_package():
Suggested change
| cpmfindpackage( | |
| NAME utf8cpp VERSION 4.0.4 GITHUB_REPOSITORY nemtrif/utfcpp EXCLUDE_FROM_ALL | |
| YES | |
| ) | |
| CPMAddPackage( | |
| NAME utf8cpp | |
| VERSION 3.2.1 | |
| GITHUB_REPOSITORY nemtrif/utfcpp | |
| GIT_TAG "v4.0.4" | |
| EXCLUDE_FROM_ALL YES | |
| ) |
e25e7b9 to
1fbee9b
Compare
1fbee9b to
27f0b70
Compare
arogge
approved these changes
Nov 18, 2024
Member
arogge
left a comment
There was a problem hiding this comment.
Looks great! Do we want a backport into Bareos 23?
7 tasks
Before, strings that have not been valid UTF8 have been silently discarded.
9d665d8 to
2f6653c
Compare
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Thank you for contributing to the Bareos Project!
Before, strings that have not been valid UTF8 have been silently ignored.
This change verifies the string and replaces invalid chars if needed. This should be the beast approach in most cases.
Please check
If you have any questions or problems, please give a comment in the PR.
Helpful documentation and best practices
Checklist for the reviewer of the PR (will be processed by the Bareos team)
Make sure you check/merge the PR using
devtools/pr-toolto have some simple automated checks run and a proper changelog record added.General
Source code quality
Tests