Merge remote-tracking branch 'origin/master'

Author: yongzhi.yang

api/http/server.go

@@ -1,19 +1,18 @@
 package http
 
 import (
-	"fmt"
-
 	"encoding/json"
+	"fmt"
 	"github.com/YangYongZhi/muxy/log"
+	"github.com/YangYongZhi/muxy/middleware"
 	m "github.com/YangYongZhi/muxy/run"
+	"github.com/YangYongZhi/muxy/symptom"
 	"github.com/YangYongZhi/muxy/throttler"
 	"io/ioutil"
 	"net/http"
+	"os/exec"
 	"reflect"
 	"time"
-
-	"github.com/YangYongZhi/muxy/middleware"
-	"github.com/YangYongZhi/muxy/symptom"
 )
 
 const (
@@ -33,19 +32,58 @@ func New(name string) *MuxyApiServer {
 }
 
 func apiHandler(w http.ResponseWriter, r *http.Request) {
-	log.Debug("request the %s api", log.Colorize(log.YELLOW, r.URL.Path[1:]))
+	log.Debug("Request method : [%s]", log.Colorize(log.YELLOW, r.URL.Path[1:]))
 	method := r.URL.Path[1:]
-	fmt.Fprintf(w, "Hi, your resource is %s\n", method)
+	//fmt.Fprintf(w, "Hi, your resource is %s\n", method)
 
 	switch method {
-	case "check":
+	case "middlewares":
 		middlewares := Muxy.MiddleWares()
 		if len(middlewares) > 0 {
-			fmt.Fprintf(w, "Muxy has been start, middleware count : %d\n", len(middlewares))
+			log.Debug("Muxy is running, middleware count : %d\n", len(middlewares))
 		}
 
-		//e.g. body = {"Device":"ens33","Latency": 2000, "TargetBandWidth":20,"PacketLoss":70,"TargetPorts": ["5001","10090"], "TargetProtos":["tcp","icmp"]}
+		//middlewareJson, _ := json.Marshal(middlewares)
+		//middlewareJsonString := string(middlewareJson)
+
+		middlewareJson, _ := json.MarshalIndent(middlewares, "", "    ")
+		middlewareJsonString := string(middlewareJson)
+		log.Debug("middlewares are :\n%s", middlewareJsonString)
+
+		w.Header().Add("Content-Type", "application/json")
+		fmt.Fprintf(w, middlewareJsonString)
+	case "networkshape":
+		// List all iptables
+		iptCmdStr := fmt.Sprintf(throttler.IptList, throttler.Ip4Tables)
+		iptCmd := exec.Command("/bin/bash", "-c", iptCmdStr)
+		iptOut, err := iptCmd.Output()
+		log.Debug("Executed command : %s", log.Colorize(log.GREEN, iptCmdStr))
+		if err != nil {
+			log.Error("Error: %s", err.Error())
+		}
+		fmt.Fprintf(w, "### %s ###:\n%s", iptCmdStr, string(iptOut))
+
+		// List all iptables 6
+		ipt6CmdStr := fmt.Sprintf(throttler.IptList, throttler.Ip6Tables)
+		ipt6Cmd := exec.Command("/bin/bash", "-c", ipt6CmdStr)
+		ipt6Out, err := ipt6Cmd.Output()
+		log.Debug("Executed command : %s", log.Colorize(log.GREEN, ipt6CmdStr))
+		if err != nil {
+			log.Error("Error: %s", err.Error())
+		}
+		fmt.Fprintf(w, "### %s ###:\n%s", ipt6CmdStr, string(ipt6Out))
+
+		// Show tc qdisc
+		tcListCmd := exec.Command("/bin/bash", "-c", throttler.TcList)
+		tcOut, err := tcListCmd.Output()
+		log.Debug("Executed command : %s", log.Colorize(log.GREEN, throttler.TcList))
+		if err != nil {
+			log.Error("Error: %s", err.Error())
+		}
+		fmt.Fprintf(w, "### %s ###:\n%s", throttler.TcList, string(tcOut))
+
 	case "reset":
+		//e.g. body = {"Device":"ens33","Latency": 2000, "TargetBandWidth":20,"PacketLoss":70,"TargetPorts": ["5001","10090"], "TargetProtos":["tcp","icmp"]}
 		log.Info("Reset the middlewares, please wait.")
 
 		//decode := json.NewDecoder(r.Body)
@@ -58,10 +96,10 @@ func apiHandler(w http.ResponseWriter, r *http.Request) {
 		var config throttler.Config
 
 		if err := json.Unmarshal(body, &config); err == nil {
-			log.Debug("latency :%s", config.Latency)
-			fmt.Fprint(w, body_str)
+			log.Debug("latency :%d", config.Latency)
+			fmt.Fprintf(w, "%s\n", body_str)
 		} else {
-			log.Error("Reset a network shape has an erro", err)
+			log.Error("Reset a network shape has an error", err)
 			fmt.Fprint(w, err)
 		}
 
@@ -72,9 +110,9 @@ func apiHandler(w http.ResponseWriter, r *http.Request) {
 
 			switch v := m.(type) {
 			case *middleware.LoggerMiddleware:
-				log.Debug("Not support %v now.", v)
+				log.Debug("Not support %v yet.", v)
 			case *symptom.HTTPDelaySymptom:
-				log.Debug("Not support %v now.", v)
+				log.Debug("Not support %v yet.", v)
 			case *symptom.NetworkShaperSymptom:
 				v.Teardown()
 
@@ -88,13 +126,25 @@ func apiHandler(w http.ResponseWriter, r *http.Request) {
 				v.TargetBandwidth = config.TargetBandwidth
 				v.TargetPorts = config.TargetPorts
 				v.TargetProtos = config.TargetProtos
+				if len(config.TargetIps) > 0 {
+					v.TargetIps = config.TargetIps
+				}
+				if len(config.TargetIps6) > 0 {
+					v.TargetIps6 = config.TargetIps6
+				}
 
 				v.Config.Device = config.Device
 				v.Config.Latency = config.Latency
 				v.Config.PacketLoss = config.PacketLoss
 				v.Config.TargetBandwidth = config.TargetBandwidth
 				v.Config.TargetPorts = config.TargetPorts
 				v.Config.TargetProtos = config.TargetProtos
+				if len(config.TargetIps) > 0 {
+					v.Config.TargetIps = config.TargetIps
+				}
+				if len(config.TargetIps6) > 0 {
+					v.Config.TargetIps6 = config.TargetIps6
+				}
 
 				v.Setup()
 			}
@@ -106,21 +156,27 @@ func apiHandler(w http.ResponseWriter, r *http.Request) {
 	case "enable":
 		log.Info("Enable the network shape of the current Muxy, please wait.")
 
+		fmt.Fprint(w, "Enable\n")
 		for _, m := range Muxy.MiddleWares() {
 			log.Info("Enable type %s", reflect.TypeOf(m))
 			m.Setup()
+			fmt.Fprintf(w, "%s.\n", reflect.TypeOf(m))
 		}
 
 		log.Info("Enable Muxy successfully")
+		fmt.Fprint(w, "Enable Muxy successfully")
 	case "disable":
 		log.Info("Disable all rules with current Muxy, please wait.")
 
+		fmt.Fprint(w, "Disable\n")
 		for _, m := range Muxy.MiddleWares() {
 			log.Info("Disable type %s", reflect.TypeOf(m))
 			m.Teardown()
+			fmt.Fprintf(w, "%s.\n", reflect.TypeOf(m))
 		}
 
 		log.Info("Disable the network shape of the current Muxy successfully")
+		fmt.Fprint(w, "Disable Muxy successfully")
 	default:
 		fmt.Fprintf(w, "Can not support %s method", r.URL.Path[1:])
 		log.Debug("Can not support %s method", log.Colorize(log.RED, r.URL.Path[1:]))

examples/dmall/centos/both.yml renamed to examples/wonton/centos/both.yml

@@ -0,0 +1,36 @@
+name: Network and HTTP screwer.
+description: Slow network to mobile levels, and add 1s delay to all messages
+loglevel: 1
+
+middleware:
+  - name: logger
+    config:
+      hex_output: false
+  - name: delay
+    config:
+      request_delay: 0
+      response_delay: 0
+ ## Network Shaper - Layer 4 Tamperer.
+ #
+ # Uses Comcast (github.com/tylertreat/comcast) to shape and interfere with network traffic,
+ # including bandwidth, latency, packet loss and jitter on specified ports, IPs and protocols.
+ #
+ # NOTE: This plugin requires root/sudo access to run
+ #            
+  - name: network_shape
+    config:
+      latency:     0        # Latency to add in ms
+      target_bw:   1000000         # Bandwidth in kbits/s
+      packet_loss: 0         # Packet loss, as a %
+      target_ips:              # Target ipv4 IP addresses/CIDRs
+        - "0.0.0.0/0"
+       # - "10.12.194.192"
+      target_ips6:             # Target ipv6 IP addresses
+        - "::1/128"
+      target_ports:            # Target destination ports
+       # - "1025:65535"
+        - "8527"
+      target_protos:           # Target protocols
+        - "tcp"
+        - "udp"
+        - "icmp"