api/cannon: Re-fix local IP check with better error handling #2124
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
|
The latest updates on your projects. Learn more about Vercel for Git ↗︎
|
victorges
commented
Apr 4, 2024
victorges
force-pushed
the
vg/fix/is-local-ip-check
branch
from
dc7a010 to
8233592
Compare
victorges
force-pushed
the
vg/fix/is-local-ip-check
branch
from
8233592 to
e3c8b68
Compare
victorges
force-pushed
the
vg/fix/is-local-ip-check
branch
from
e3c8b68 to
1e15d91
Compare
Can't parametrize table name
This reverts commit 39e9b14.
|
LGTM but see discord thread on internal discussion. |
leszko
approved these changes
Apr 24, 2024
| } SET data = jsonb_set(data, '{status}', case when data->'status' is null then '{}' else data->'status' end || '${JSON.stringify( | ||
| status | ||
| )}') WHERE id = '${id}'` | ||
| sql`` |
There was a problem hiding this comment.
Is this change related to the local IP change? Or is it just refactor? Both are fine, I'm just trying to connect the dots.
There was a problem hiding this comment.
It is not related, it is a fix to use proper SQL parameters in the query instead of raw string interpolation. As I was testing this there were some errors that contained ' and the query failed, so we need to use proper sql strings here. I can move this to a separate PR if you think it's necessary.
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.
What does this pull request do? Explain your changes. (required)
This brings back the fix from #2118, reverted by #2123, adding proper error checking
when a given domain has no IPs configured (likely for v4 or v6 only).
This also makes the resolution errors non-fatal, so we default to trust the domains
in case we have a problem with the local IP check. This is less secure but avoids
surprises in case this breaks again. We should also add an alert when there are failures
in resolving the domain (from that log inside the
catch).Specific updates (required)
How did you test each of these updates (required)
yarn testDoes this pull request close any open issues?
Informal on discord.
Checklist