Skip to content

Commit

Permalink
fix hostname params and add full-disable params (chaos-mesh#226)
Browse files Browse the repository at this point in the history
Signed-off-by: Nikita Savchenko <nikisavchenko@ozon.ru>
  • Loading branch information
Nikita Savchenko committed Jan 30, 2023
1 parent 31631c3 commit a6d3dfe
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 3 deletions.
6 changes: 4 additions & 2 deletions cmd/attack/network.go
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ func NewNetworkDelayCommand(dep fx.Option, options *core.NetworkCommand) *cobra.
cmd.Flags().StringVarP(&options.IPProtocol, "protocol", "p", "",
"only impact traffic using this IP protocol, supported: tcp, udp, icmp, all")
cmd.Flags().StringVarP(&options.AcceptTCPFlags, "accept-tcp-flags", "", "", "only the packet which match the tcp flag can be accepted, others will be dropped. only set when the protocol is tcp.")
cmd.Flags().BoolVar(&options.FullDisable, "full-disable", false, "network on device full disable flag")

return cmd
}
Expand Down Expand Up @@ -114,6 +115,7 @@ func NewNetworkLossCommand(dep fx.Option, options *core.NetworkCommand) *cobra.C
cmd.Flags().StringVarP(&options.Hostname, "hostname", "H", "", "only impact traffic to these hostnames")
cmd.Flags().StringVarP(&options.IPProtocol, "protocol", "p", "",
"only impact traffic using this IP protocol, supported: tcp, udp, icmp, all")
cmd.Flags().BoolVar(&options.FullDisable, "full-disable", false, "network on device full disable flag")

return cmd
}
Expand Down Expand Up @@ -143,7 +145,7 @@ func NewNetworkCorruptCommand(dep fx.Option, options *core.NetworkCommand) *cobr
cmd.Flags().StringVarP(&options.Hostname, "hostname", "H", "", "only impact traffic to these hostnames")
cmd.Flags().StringVarP(&options.IPProtocol, "protocol", "p", "",
"only impact traffic using this IP protocol, supported: tcp, udp, icmp, all")

cmd.Flags().BoolVar(&options.FullDisable, "full-disable", false, "network on device full disable flag")
return cmd
}

Expand Down Expand Up @@ -172,7 +174,7 @@ func NetworkDuplicateCommand(dep fx.Option, options *core.NetworkCommand) *cobra
cmd.Flags().StringVarP(&options.Hostname, "hostname", "H", "", "only impact traffic to these hostnames")
cmd.Flags().StringVarP(&options.IPProtocol, "protocol", "p", "",
"only impact traffic using this IP protocol, supported: tcp, udp, icmp, all")

cmd.Flags().BoolVar(&options.FullDisable, "full-disable", false, "network on device full disable flag")
return cmd
}

Expand Down
29 changes: 28 additions & 1 deletion pkg/core/network.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ type NetworkCommand struct {
IPProtocol string `json:"ip-protocol,omitempty"`
Hostname string `json:"hostname,omitempty"`

Direction string `json:"direction,omitempty"`
Direction string `json:"direction,omitempty"`
FullDisable bool `json:"full-disable,omitempty"`

// used for DNS attack
DNSServer string `json:"dns-server,omitempty"`
Expand Down Expand Up @@ -142,6 +143,10 @@ func (n *NetworkCommand) validNetworkDelay() error {
return errors.Errorf("protocol should be 'tcp' when set accept-tcp-flags")
}

if err := checkNetworkLimitParams(n.Hostname, n.IPAddress, n.FullDisable); err != nil {
return err
}

return checkProtocolAndPorts(n.IPProtocol, n.SourcePort, n.EgressPort)
}

Expand All @@ -150,6 +155,10 @@ func (n *NetworkCommand) validNetworkBandwidth() error {
return errors.Errorf("rate, limit and buffer both are required when action is bandwidth")
}

if err := checkNetworkLimitParams(n.Hostname, n.IPAddress, n.FullDisable); err != nil {
return err
}

return nil
}

Expand All @@ -174,6 +183,10 @@ func (n *NetworkCommand) validNetworkCommon() error {
return errors.Errorf("ip addressed %s not valid", n.IPAddress)
}

if err := checkNetworkLimitParams(n.Hostname, n.IPAddress, n.FullDisable); err != nil {
return err
}

return checkProtocolAndPorts(n.IPProtocol, n.SourcePort, n.EgressPort)
}

Expand Down Expand Up @@ -333,6 +346,20 @@ func checkProtocolAndPorts(p string, sports string, dports string) error {
return nil
}

func checkNetworkLimitParams(hostname string, ipaddress string, fullDisable bool) error {
if len(hostname) == 0 && len(ipaddress) == 0 && !fullDisable {
return errors.New("hostname or ip address is required")
}

if fullDisable {
if len(hostname) > 0 || len(ipaddress) > 0 {
return errors.New("the host and address are set, but the flag full-disable is enabled")
}
}

return nil
}

func (n NetworkCommand) RecoverData() string {
data, _ := json.Marshal(n)

Expand Down

0 comments on commit a6d3dfe

Please sign in to comment.