CyberCoveLLC/threshold
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enhance tcp client port vet logic (#3175)

Browse Source
This commit is contained in:
Jeff Mitchell authored and GitHub committed 2023-04-21 09:34:59 -04:00
1 parent 20391e3503
commit e7bf134710
1 file changed
+41 -11
Download Patch File Download Diff File Expand all files Collapse all files
internal/daemon/controller/handlers/targets/tcp/tcp.go
+41 -11
View File
@@ -4,6 +4,8 @@
package tcp
import (
"math"
"github.com/golang/protobuf/ptypes/wrappers"
"github.com/hashicorp/boundary/internal/daemon/controller/handlers"
"github.com/hashicorp/boundary/internal/daemon/controller/handlers/targets"
@@ -14,7 +16,10 @@ import (
pb "github.com/hashicorp/boundary/sdk/pbs/controller/api/resources/targets"
)
const defaultPortField = "attributes.default_port"
const (
defaultPortField = "attributes.default_port"
defaultClientPortField = "attributes.default_client_port"
)
type attribute struct {
*pb.TcpTargetAttributes
@@ -34,22 +39,47 @@ func (a *attribute) Options() []target.Option {
func (a *attribute) Vet() map[string]string {
badFields := map[string]string{}
if a.GetDefaultPort() == nil {
badFields["attributes.default_port"] = "This field is required."
} else if a.GetDefaultPort().GetValue() == 0 {
badFields["attributes.default_port"] = "This field cannot be set to zero."
badFields[defaultPortField] = "This field is required."
} else {
if a.GetDefaultPort().GetValue() == 0 {
badFields[defaultPortField] = "This field cannot be set to zero."
}
if a.GetDefaultPort().GetValue() > math.MaxUint16 {
badFields[defaultPortField] = "Value is greater than maximum port number."
}
}
if a.GetDefaultClientPort() != nil {
if a.GetDefaultClientPort().GetValue() == 0 {
badFields[defaultClientPortField] = "This field cannot be set to zero."
}
if a.GetDefaultClientPort().GetValue() > math.MaxUint16 {
badFields[defaultClientPortField] = "Value is greater than maximum port number."
}
}
return badFields
}
func (a *attribute) VetForUpdate(p []string) map[string]string {
if !handlers.MaskContains(p, defaultPortField) {
return nil
}
badFields := map[string]string{}
if a.GetDefaultPort() == nil {
badFields["attributes.default_port"] = "This field is required."
} else if a.GetDefaultPort().GetValue() == 0 {
badFields["attributes.default_port"] = "This cannot be set to zero."
if handlers.MaskContains(p, defaultPortField) {
if a.GetDefaultPort() == nil {
badFields[defaultPortField] = "This field is required."
} else {
if a.GetDefaultPort().GetValue() == 0 {
badFields[defaultPortField] = "This cannot be set to zero."
}
if a.GetDefaultPort().GetValue() > math.MaxUint16 {
badFields[defaultPortField] = "Value is greater than maximum port number."
}
}
}
if handlers.MaskContains(p, defaultClientPortField) && a.GetDefaultClientPort() != nil {
if a.GetDefaultClientPort().GetValue() == 0 {
badFields[defaultClientPortField] = "This cannot be set to zero."
}
if a.GetDefaultClientPort().GetValue() > math.MaxUint16 {
badFields[defaultClientPortField] = "Value is greater than maximum port number."
}
}
return badFields
}