-
-
Notifications
You must be signed in to change notification settings - Fork 373
feat: Add --allow-invalid-content-type-endpoint option to validate-json #932
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
Open
zoliszabo
wants to merge
3
commits into
jsonrainbow:main
Choose a base branch
from
zoliszabo:feature/env-for-invalid-content-type-endpoints
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+45
−2
Open
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -24,7 +24,12 @@ $arOptions = []; | |
| $arArgs = []; | ||
| array_shift($argv);//script itself | ||
| foreach ($argv as $arg) { | ||
| if ($arg[0] == '-') { | ||
| if (strpos($arg, '--allow-invalid-content-type-endpoint=') === 0) { | ||
| $endpoint = substr($arg, strlen('--allow-invalid-content-type-endpoint=')); | ||
| if ($endpoint !== '') { | ||
| $arOptions['--allow-invalid-content-type-endpoint'][] = $endpoint; | ||
| } | ||
| } elseif ($arg[0] == '-') { | ||
| $arOptions[$arg] = true; | ||
| } else { | ||
| $arArgs[] = $arg; | ||
|
|
@@ -42,6 +47,10 @@ Usage: validate-json data.json | |
| Options: | ||
| --dump-schema Output full schema and exit | ||
| --dump-schema-url Output URL of schema | ||
| --allow-invalid-content-type-endpoint=<url> | ||
| Skip the Content-Type check for schemas fetched | ||
| from the given URL prefix. May be given multiple | ||
| times. | ||
| --verbose Show additional output | ||
| --quiet Suppress all output | ||
| -h --help Show this help | ||
|
|
@@ -191,6 +200,13 @@ if ($pathSchema[0] == '/') { | |
|
|
||
| $resolver = new JsonSchema\Uri\UriResolver(); | ||
| $retriever = new JsonSchema\Uri\UriRetriever(); | ||
| if (isset($arOptions['--allow-invalid-content-type-endpoint']) | ||
| && is_array($arOptions['--allow-invalid-content-type-endpoint']) | ||
| ) { | ||
| foreach ($arOptions['--allow-invalid-content-type-endpoint'] as $endpoint) { | ||
| $retriever->addInvalidContentTypeEndpoint($endpoint); | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is only applied to the schema storage which isn't passed to the validator on line 233 new JsonSchema\Validator(new JsonSchema\Constraints\Factory($refResolver, $retriever)) |
||
| } | ||
| } | ||
| try { | ||
| $urlSchema = $resolver->resolve($pathSchema, $urlData); | ||
|
|
||
|
|
||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The parsing should be improved. This introduces two unwanted edge cases:
Empty value error (
--allow-invalid-content-type-endpoint=) is silently ignored. This should result in an non success exit code.Value passing without a equals sign (
--allow-invalid-content-type-endpoint https://schemas.wp.org) would set$arArgs['https://schemas.wp.org'] = trueresulting in an error