Skip to content
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

Jump to bottom

Improve validation of address with VerifyAddressFormat #677

Merged
merged 3 commits into from
Jun 19, 2020
Merged

Improve validation of address with VerifyAddressFormat #677

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
95bb9fa
Improve parsing addresses with VerifyAddressFormat
akhilkumarpilli Jun 18, 2020
dfe1a1a
Add state filter cli tests and modify owner validation in filters
akhilkumarpilli Jun 19, 2020
cb95c67
Merge branch 'master' of github.com:ovrclk/akash into akhil/parse-add…
akhilkumarpilli Jun 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 4 additions & 2 deletions x/deployment/query/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,11 @@ type DeploymentFilters struct {
State types.DeploymentState
}

// Accept returns whether deployment filters valid or not
func (filters DeploymentFilters) Accept(obj types.Deployment, isValidState bool) bool {
if (filters.Owner.Empty() && !isValidState) ||
(filters.Owner.Empty() && (obj.State == filters.State)) ||
err := sdk.VerifyAddressFormat(filters.Owner)
akhilkumarpilli marked this conversation as resolved.
Show resolved Hide resolved
if (err != nil && !isValidState) ||
(err != nil && (obj.State == filters.State)) ||
(!isValidState && (obj.DeploymentID.Owner.Equals(filters.Owner))) ||
(obj.DeploymentID.Owner.Equals(filters.Owner) && obj.State == filters.State) {
return true
Expand Down
3 changes: 2 additions & 1 deletion x/deployment/types/id.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@ func (id DeploymentID) Equals(other DeploymentID) bool {

// Validate method for DeploymentID and returns nil
func (id DeploymentID) Validate() error {
err := sdk.VerifyAddressFormat(id.Owner)
switch {
case id.Owner.Empty():
case err != nil:
return sdkerrors.Wrap(sdkerrors.ErrInvalidAddress, "DeploymentID: Invalid Owner Address")
case id.DSeq == 0:
return sdkerrors.Wrap(sdkerrors.ErrInvalidSequence, "DeploymentID: Invalid Deployment Sequence")
Expand Down
2 changes: 1 addition & 1 deletion x/deployment/types/msgs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ func (msg MsgUpdateDeployment) ValidateBasic() error {
return err
}

if msg.Version.Empty() {
if err := sdk.VerifyAddressFormat(msg.Version); err != nil {
return ErrEmptyVersion
}

Expand Down
15 changes: 9 additions & 6 deletions x/market/query/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,9 @@ type LeaseFilters struct {

// Accept returns true if object matches filter requirements
func (f OrderFilters) Accept(obj types.Order, isValidState bool) bool {
if (f.Owner.Empty() && !isValidState) ||
(f.Owner.Empty() && (obj.State == f.State)) ||
err := sdk.VerifyAddressFormat(f.Owner)
if (err != nil && !isValidState) ||
(err != nil && (obj.State == f.State)) ||
(!isValidState && obj.OrderID.Owner.Equals(f.Owner)) ||
(obj.OrderID.Owner.Equals(f.Owner) && obj.State == f.State) {
return true
Expand All @@ -68,8 +69,9 @@ func (f OrderFilters) Accept(obj types.Order, isValidState bool) bool {

// Accept returns true if object matches filter requirements
func (f BidFilters) Accept(obj types.Bid, isValidState bool) bool {
if (f.Owner.Empty() && !isValidState) ||
(f.Owner.Empty() && (obj.State == f.State)) ||
err := sdk.VerifyAddressFormat(f.Owner)
if (err != nil && !isValidState) ||
(err != nil && (obj.State == f.State)) ||
(!isValidState && obj.BidID.Owner.Equals(f.Owner)) ||
(obj.BidID.Owner.Equals(f.Owner) && obj.State == f.State) {
return true
Expand All @@ -80,8 +82,9 @@ func (f BidFilters) Accept(obj types.Bid, isValidState bool) bool {

// Accept returns true if object matches filter requirements
func (f LeaseFilters) Accept(obj types.Lease, isValidState bool) bool {
if (f.Owner.Empty() && !isValidState) ||
(f.Owner.Empty() && (obj.State == f.State)) ||
err := sdk.VerifyAddressFormat(f.Owner)
if (err != nil && !isValidState) ||
(err != nil && (obj.State == f.State)) ||
(!isValidState && (obj.LeaseID.Owner.Equals(f.Owner))) ||
(obj.LeaseID.Owner.Equals(f.Owner) && obj.State == f.State) {
return true
Expand Down
2 changes: 1 addition & 1 deletion x/market/types/id.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ func (id BidID) Validate() error {
if err := id.OrderID().Validate(); err != nil {
return sdkerrors.Wrap(err, "BidID: Invalid OrderID")
}
if id.Provider.Empty() {
if err := sdk.VerifyAddressFormat(id.Provider); err != nil {
return sdkerrors.Wrap(sdkerrors.ErrInvalidAddress, "BidID: Invalid Provider Address")
}
return nil
Expand Down
2 changes: 1 addition & 1 deletion x/market/types/msgs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ func (msg MsgCreateBid) ValidateBasic() error {
return err
}

if msg.Provider.Empty() {
if err := sdk.VerifyAddressFormat(msg.Provider); err != nil {
return ErrEmptyProvider
}

Expand Down
6 changes: 3 additions & 3 deletions x/provider/types/msgs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ func (msg MsgCreateProvider) ValidateBasic() error {
if err := validateProviderURI(msg.HostURI); err != nil {
return err
}
if msg.Owner.Empty() {
if err := sdk.VerifyAddressFormat(msg.Owner); err != nil {
return sdkerrors.Wrap(sdkerrors.ErrInvalidAddress, "MsgCreate: Invalid Provider Address")
}
return nil
Expand Down Expand Up @@ -58,7 +58,7 @@ func (msg MsgUpdateProvider) ValidateBasic() error {
if err := validateProviderURI(msg.HostURI); err != nil {
return err
}
if msg.Owner.Empty() {
if err := sdk.VerifyAddressFormat(msg.Owner); err != nil {
return sdkerrors.Wrap(sdkerrors.ErrInvalidAddress, "MsgUpdate: Invalid Provider Address")
}
return nil
Expand Down Expand Up @@ -87,7 +87,7 @@ func (msg MsgDeleteProvider) Type() string { return msgTypeDeleteProvider }

// ValidateBasic does basic validation
func (msg MsgDeleteProvider) ValidateBasic() error {
if msg.Owner.Empty() {
if err := sdk.VerifyAddressFormat(msg.Owner); err != nil {
return sdkerrors.Wrap(sdkerrors.ErrInvalidAddress, "MsgDelete: Invalid Provider Address")
}
return nil
Expand Down