From eee357abba1f08c6dde6caf9c4463e752d4c056e Mon Sep 17 00:00:00 2001 From: Nikita Savchenko Date: Mon, 30 Jan 2023 21:22:12 +0400 Subject: [PATCH] fix hostname params and add full-disable params (#226) Signed-off-by: Nikita Savchenko --- cmd/attack/network.go | 6 ++++-- pkg/core/network.go | 33 +++++++++++++++++++++++++++++--- test/integration_test/jvm/run.sh | 2 +- 3 files changed, 35 insertions(+), 6 deletions(-) diff --git a/cmd/attack/network.go b/cmd/attack/network.go index b15d14eb..d935f6cc 100644 --- a/cmd/attack/network.go +++ b/cmd/attack/network.go @@ -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 } @@ -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 } @@ -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 } @@ -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 } diff --git a/pkg/core/network.go b/pkg/core/network.go index eae0e6cb..7fc459a0 100644 --- a/pkg/core/network.go +++ b/pkg/core/network.go @@ -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"` @@ -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) } @@ -150,7 +155,9 @@ func (n *NetworkCommand) validNetworkBandwidth() error { return errors.Errorf("rate, limit and buffer both are required when action is bandwidth") } - return nil + err := checkNetworkLimitParams(n.Hostname, n.IPAddress, n.FullDisable) + + return err } func (n *NetworkCommand) validNetworkCommon() error { @@ -174,6 +181,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) } @@ -198,7 +209,9 @@ func (n *NetworkCommand) validNetworkPartition() error { return errors.Errorf("ip protocols %s not valid", n.IPProtocol) } - return nil + err := checkNetworkLimitParams(n.Hostname, n.IPAddress, n.FullDisable) + + return err } func (n *NetworkCommand) validNetworkDNS() error { @@ -333,6 +346,20 @@ func checkProtocolAndPorts(p string, sports string, dports string) error { return nil } +func checkNetworkLimitParams(hostname string, ipaddress string, fullDisable bool) error { // revive:disable-line:flag-parameter + 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) diff --git a/test/integration_test/jvm/run.sh b/test/integration_test/jvm/run.sh index 13b9bd07..19205ab2 100644 --- a/test/integration_test/jvm/run.sh +++ b/test/integration_test/jvm/run.sh @@ -84,7 +84,7 @@ export MYSQL_USER=root export MYSQL_CONNECTOR_VERSION=8 mvn exec:java -Dexec.mainClass="com.mysqldemo.App" > mysqldemo.log 2>&1 & # make sure it works -for (( i=0; i<=20; i++ )) +for (( i=0; i<=30; i++ )) do tail_log=`tail -1 mysqldemo.log` if [ "$tail_log" == "Server start!" ]; then