Skip to content

fix(x/upgrade): Stop treating inline JSON as a URL #19706

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.

Sign up for GitHub

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

Merged
julienrbrt merged 3 commits into from
Mar 16, 2024
Merged

fix(x/upgrade): Stop treating inline JSON as a URL #19706

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
892c4e4
fix(x/upgrade): Stop treating inline JSON as a URL
gibson042 Mar 7, 2024
0cbf9d1
docs: Move module-specific changelog update to the right place
gibson042 Mar 13, 2024
1c7741e
Merge branch 'main' into gh-19686-parseinfo-url-detection
julienrbrt Mar 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions x/upgrade/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@ Ref: https://keepachangelog.com/en/1.0.0/

* [#19443](https://github.com/cosmos/cosmos-sdk/pull/19443) `NewKeeper` takes an `appmodule.Environment` instead of individual services.

### Bug Fixes

* [#19706](https://github.com/cosmos/cosmos-sdk/pull/19706) Stop treating inline JSON as a URL.

## [v0.1.1](https://github.com/cosmos/cosmos-sdk/releases/tag/x/upgrade/v0.1.1) - 2023-12-11

### Improvements
Expand Down
2 changes: 1 addition & 1 deletion x/upgrade/plan/info.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ func ParseInfo(infoStr string, opts ...ParseOption) (*Info, error) {
}

// If it's a url, download it and treat the result as the real info.
if _, err := neturl.Parse(infoStr); err == nil {
if _, err := neturl.ParseRequestURI(infoStr); err == nil {
if err := ValidateURL(infoStr, parseConfig.EnforceChecksum); err != nil {
return nil, err
}
Expand Down
6 changes: 6 additions & 0 deletions x/upgrade/plan/info_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,12 @@ func (s *InfoTestSuite) TestParseInfo() {
expectedInfo: nil,
expectedInError: []string{"plan info must not be blank"},
},
{
name: "empty JSON",
infoStrMaker: makeInfoStrFuncString("{}"),
expectedInfo: &Info{},
expectedInError: nil,
},
{
name: "json binaries is wrong data type",
infoStrMaker: makeInfoStrFuncString(binariesWrongJSON),
Expand Down
⚡