Skip to content

Commit

Permalink
fix(x/upgrade): Stop treating inline JSON as a URL (backport #19706) (#…
Browse files Browse the repository at this point in the history
…19767)

Co-authored-by: Richard Gibson <richard.gibson@gmail.com>
Co-authored-by: marbar3778 <marbar3778@yahoo.com>
  • Loading branch information
3 people authored Mar 18, 2024
1 parent 9a59234 commit 0df2902
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 1 deletion.
4 changes: 4 additions & 0 deletions x/upgrade/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ Ref: https://keepachangelog.com/en/1.0.0/

## [Unreleased]

### 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
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
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,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

0 comments on commit 0df2902

Please sign in to comment.