Merge pull request #25 from pf93/feature-support-check-cert-dispatch

support check domain cert dispatch by rule invoke chain

Author: MonsieurWill

cloud/pkg/router/listener/http.go

@@ -109,9 +109,9 @@ func (rh *RestHandler) httpHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	matchPath, exist := rh.matchedPath(r.RequestURI)
+	matchPath, exist := rh.matchedPath(r.URL.Path)
 	if !exist {
-		klog.Warningf("URL format incorrect: %s", r.RequestURI)
+		klog.Warningf("URL format incorrect: %s", r.URL.Path)
 		w.WriteHeader(http.StatusNotFound)
 		if _, err := w.Write([]byte("Request error")); err != nil {
 			klog.Errorf("Response write error: %s, %s", r.RequestURI, err.Error())
@@ -146,6 +146,7 @@ func (rh *RestHandler) httpHandler(w http.ResponseWriter, r *http.Request) {
 		params["request"] = r
 		params["timeout"] = rh.restTimeout
 		params["data"] = b
+		params["param"] = r.URL.RawQuery
 
 		v, err := handle(params)
 		if err != nil {

cloud/pkg/router/provider/servicebus/servicebus.go

@@ -27,6 +27,7 @@ type ServiceBus struct {
 	targetPath  string
 	servicePort string
 	nodeName    string
+	protocol    string
 	TargetURL   string
 }
 
@@ -116,6 +117,7 @@ func (sf *servicebusFactory) GetTarget(ep *v1.RuleEndpoint, targetResource map[s
 	cli := &ServiceBus{
 		targetPath:  targetPath,
 		servicePort: ep.Spec.Properties["service_port"],
+		protocol:  ep.Spec.Properties["protocol"],
 	}
 	return cli
 }
@@ -129,6 +131,7 @@ func (sb *ServiceBus) GoToTarget(data map[string]interface{}, stop chan struct{}
 	request.Method, ok = data["method"].(string)
 	request.Header, ok = data["header"].(http.Header)
 	request.Body, ok = data["data"].([]byte)
+	request.Protocol = sb.protocol
 	if !ok {
 		err := errors.New("data transform failed")
 		klog.Error(err.Error())
@@ -141,7 +144,7 @@ func (sb *ServiceBus) GoToTarget(data map[string]interface{}, stop chan struct{}
 	if !ok || param == "" {
 		resource = resource + sb.targetPath
 	} else {
-		resource = resource + strings.TrimSuffix(sb.targetPath, "/") + "/" + strings.TrimPrefix(param, "/")
+		resource = resource + strings.TrimSuffix(sb.targetPath, "/") + "?" + strings.TrimPrefix(param, "?")
 	}
 	msg.SetResourceOperation(resource, request.Method)
 	msg.FillBody(request)

common/types/http.go

@@ -4,10 +4,11 @@ import "net/http"
 
 // HTTPRequest is used structure used to unmarshal message content from cloud
 type HTTPRequest struct {
-	Header http.Header `json:"header"`
-	Body   []byte      `json:"body"`
-	Method string      `json:"method"`
-	URL    string      `json:"url"`
+	Header   http.Header `json:"header"`
+	Body     []byte      `json:"body"`
+	Method   string      `json:"method"`
+	Protocol string      `json:"protocol"`
+	URL      string      `json:"url"`
 }
 
 // HTTPResponse is HTTP request's response structure used to send response to cloud

edge/pkg/servicebus/servicebus.go

@@ -168,7 +168,10 @@ func processMessage(msg *beehiveModel.Message) {
 
 		//send message with resource to the edge part
 		operation := httpRequest.Method
-		targetURL := "http://127.0.0.1:" + r[0] + r[1]
+		if httpRequest.Protocol == "" {
+			httpRequest.Protocol = "http"
+		}
+		targetURL := httpRequest.Protocol + "://127.0.0.1:" + r[0] + r[1]
 		resp, err := uc.HTTPDo(operation, targetURL, httpRequest.Header, httpRequest.Body)
 		if err != nil {
 			m := "error to call service"

edge/pkg/servicebus/util/httpclient.go

@@ -68,9 +68,11 @@ func (client *URLClient) HTTPDo(method, rawURL string, headers http.Header, body
 
 func (client *URLClient) clientHasPrefix(url, pro string) {
 	if strings.HasPrefix(url, pro) {
-		if transport, ok := client.Client.Transport.(*http.Transport); ok {
-			transport.TLSClientConfig = client.TLS
-		}
+		client.Client.Transport = &http.Transport{
+            TLSClientConfig: &tls.Config{
+                InsecureSkipVerify: true,
+            },
+        }
 	}
 }