-
Notifications
You must be signed in to change notification settings - Fork 2.5k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix: LEAP-396: More exhaustative IP validation for SSRF defenses, plus user configurability #5316
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
✅ Deploy Preview for label-studio-docs-new-theme canceled.
|
✅ Deploy Preview for heartex-docs canceled.
|
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## develop #5316 +/- ##
===========================================
- Coverage 75.88% 75.70% -0.19%
===========================================
Files 154 154
Lines 12925 12926 +1
===========================================
- Hits 9808 9785 -23
- Misses 3117 3141 +24 ☔ View full report in Codecov by Sentry. |
bmartel
reviewed
Jan 22, 2024
bmartel
approved these changes
Jan 22, 2024
wesleylima
approved these changes
Jan 22, 2024
juliosgarbi
pushed a commit
that referenced
this pull request
Jan 22, 2024
…s user configurability (#5316) * fix: LEAP-396: More exhaustative IP validation for SSRF, plus user configurability * unbotch * fix test * more testing * fix false positive finding from Bandit
juliosgarbi
added a commit
that referenced
this pull request
Jan 22, 2024
* chore: Cherry picked DIA-820 into release 1.11.0 * fix: LEAP-396: More exhaustative IP validation for SSRF defenses, plus user configurability (#5316) * fix: LEAP-396: More exhaustative IP validation for SSRF, plus user configurability * unbotch * fix test * more testing * fix false positive finding from Bandit * ci: Build frontend Workflow run: https://github.com/HumanSignal/label-studio/actions/runs/7618278765 * [submodules] Copy src HumanSignal/dm2 Workflow run: https://github.com/HumanSignal/label-studio/actions/runs/7618518612 * [submodules] Copy src HumanSignal/dm2 Workflow run: https://github.com/HumanSignal/label-studio/actions/runs/7618540291 * ci: Build frontend Workflow run: https://github.com/HumanSignal/label-studio/actions/runs/7618557170 * fix submodules * fix submodules --------- Co-authored-by: robot-ci-heartex <[email protected]> Co-authored-by: Jo Booth <[email protected]> Co-authored-by: robot-ci-heartex <[email protected]> Co-authored-by: yyassi-heartex <[email protected]>
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.
Ban all IPs within reserved blocks, for both IPv4 and IPv6, by default: https://en.wikipedia.org/wiki/Reserved_IP_addresses
Additionally, allow users the ability to ban additional blocks (with
USER_ADDITIONAL_BANNED_SUBNETS
), or to specify their full list of banned IP blocks themselves (seeUSE_DEFAULT_BANNED_SUBNETS
, defaultTrue
), as their network setup may require.Also, make the error message more helpful when SSRF protection blocks an upload: