Handle multiple action candidates

Author: iann0036

proxy.go

@@ -188,6 +188,7 @@ type ServiceHttp struct {
 }
 
 type ServiceStructure struct {
+	Required     []string                    `json:"required"`
 	Shape        string                      `json:"shape"`
 	Type         string                      `json:"type"`
 	Member       *ServiceStructure           `json:"member"`
@@ -268,6 +269,14 @@ func flatten(top bool, flatMap map[string][]string, nested interface{}, prefix s
 	return nil
 }
 
+type ActionCandidate struct {
+	Path      string
+	Action    string
+	URIParams map[string]string
+	Params    map[string][]string
+	Operation ServiceOperation
+}
+
 func handleAWSRequest(req *http.Request, body []byte, respCode int) {
 	host := req.Host
 	uri := req.RequestURI
@@ -297,107 +306,7 @@ func handleAWSRequest(req *http.Request, body []byte, respCode int) {
 	params := make(map[string][]string)
 	action := "*"
 
-	if serviceDef.Metadata.Protocol == "rest-json" {
-		// URL param schema
-		urlobj, err := url.ParseRequestURI(uri)
-		if err != nil {
-			return
-		}
-		vals := urlobj.Query()
-
-		// path part
-		longestPath := ""
-
-	OperationLoop:
-		for operationName, operation := range serviceDef.Operations {
-			path := urlobj.Path
-			if operation.Http.RequestURI == "" || operation.Http.RequestURI[0] != '/' {
-				operation.Http.RequestURI = "/" + operation.Http.RequestURI
-			}
-
-			if strings.Contains(operation.Http.RequestURI, "?") {
-				path += "?"
-
-				operationurlobj, err := url.ParseRequestURI(operation.Http.RequestURI)
-				if err != nil {
-					continue
-				}
-
-				operationquery := operationurlobj.Query()
-				for operationquerykey, operationqueryvalue := range operationquery {
-					if _, ok := vals[operationquerykey]; ok {
-						if operationqueryvalue[0] == "" {
-							path += operationquerykey + "&"
-						} else if len(vals[operationquerykey]) > 0 {
-							path += operationquerykey + "=" + vals[operationquerykey][0] + "&"
-						} else {
-							continue OperationLoop
-						}
-					} else {
-						continue OperationLoop
-					}
-				}
-
-				if path[len(path)-1] == '&' {
-					path = path[:len(path)-1]
-				}
-			}
-
-			templateMatches := regexp.MustCompile(`{([^}]+?)\+?}`).FindAllStringSubmatch(operation.Http.RequestURI, -1)
-			regexStr := regexp.MustCompile(`\\{([^}]+?\\\+)\\}`).ReplaceAllString(regexp.QuoteMeta(operation.Http.RequestURI), `([^?]+)`) // {Key+}
-			regexStr = fmt.Sprintf("^%s$", regexp.MustCompile(`\\{(.+?)\\}`).ReplaceAllString(regexStr, `([^/?]+?)`))                     // {Bucket}
-			pathMatchSuccess := regexp.MustCompile(regexStr).Match([]byte(path))
-
-			if operation.Http.Method == "" {
-				operation.Http.Method = "POST"
-			}
-
-			if operation.Http.Method == req.Method && pathMatchSuccess {
-				if len(path) > len(longestPath) {
-					longestPath = path
-				} else {
-					continue
-				}
-
-				action = operationName
-				pathMatches := regexp.MustCompile(regexStr).FindAllStringSubmatch(path, -1)
-
-				if len(pathMatches) > 0 && len(pathMatches) > 0 && len(templateMatches) == len(pathMatches[0])-1 {
-					for i := 0; i < len(templateMatches); i++ {
-						uriparams[templateMatches[i][1]] = pathMatches[0][1:][i]
-					}
-				}
-			}
-		}
-
-		// query part
-		for k, v := range vals {
-			normalizedK := regexp.MustCompile(`\.member\.[0-9]+`).ReplaceAllString(k, "[]")
-			normalizedK = regexp.MustCompile(`\.[0-9]+`).ReplaceAllString(normalizedK, "[]")
-
-			resolvedPropertyName := resolvePropertyName(serviceDef.Operations[action].Input, normalizedK, "", "", serviceDef.Shapes)
-			if resolvedPropertyName != "" {
-				normalizedK = resolvedPropertyName
-			}
-
-			if len(params[normalizedK]) > 0 {
-				params[normalizedK] = append(params[normalizedK], v...)
-			} else {
-				params[normalizedK] = v
-			}
-		}
-
-		// body part
-		if len(body) > 0 {
-			var bodyJSON interface{}
-			err := json.Unmarshal(body, &bodyJSON)
-			if err != nil {
-				return
-			}
-
-			flatten(true, params, bodyJSON, "")
-		}
-	} else if serviceDef.Metadata.Protocol == "json" {
+	if serviceDef.Metadata.Protocol == "json" {
 		// JSON schema
 		var bodyJSON interface{}
 		err := json.Unmarshal(body, &bodyJSON)
@@ -444,18 +353,18 @@ func handleAWSRequest(req *http.Request, body []byte, respCode int) {
 				}
 			}
 		}
-	} else if serviceDef.Metadata.Protocol == "rest-xml" {
+	} else if serviceDef.Metadata.Protocol == "rest-json" || serviceDef.Metadata.Protocol == "rest-xml" {
 		// URL param schema
 		urlobj, err := url.ParseRequestURI(uri)
 		if err != nil {
 			return
 		}
 		vals := urlobj.Query()
 
-		// path part
-		longestPath := ""
+		actionCandidates := []ActionCandidate{}
 
-	OperationLoop2:
+		// path part
+	OperationLoop:
 		for operationName, operation := range serviceDef.Operations {
 			path := urlobj.Path
 			if serviceDef.Metadata.EndpointPrefix == "s3" && strings.HasPrefix(operation.Http.RequestURI, "/{Bucket}") && endpointUriPrefix != "" { // https://docs.aws.amazon.com/AmazonS3/latest/userguide/VirtualHosting.html#VirtualHostingSpecifyBucket
@@ -485,10 +394,10 @@ func handleAWSRequest(req *http.Request, body []byte, respCode int) {
 						} else if len(vals[operationquerykey]) > 0 {
 							path += operationquerykey + "=" + vals[operationquerykey][0] + "&"
 						} else {
-							continue OperationLoop2
+							continue OperationLoop
 						}
 					} else {
-						continue OperationLoop2
+						continue OperationLoop
 					}
 				}
 
@@ -507,50 +416,116 @@ func handleAWSRequest(req *http.Request, body []byte, respCode int) {
 			}
 
 			if operation.Http.Method == req.Method && pathMatchSuccess {
-				if len(path) > len(longestPath) {
-					longestPath = path
-				} else {
-					continue
-				}
-
 				action = operationName
+				uriparams = map[string]string{}
+
 				pathMatches := regexp.MustCompile(regexStr).FindAllStringSubmatch(path, -1)
 
 				if len(pathMatches) > 0 && len(pathMatches) > 0 && len(templateMatches) == len(pathMatches[0])-1 {
 					for i := 0; i < len(templateMatches); i++ {
 						uriparams[templateMatches[i][1]] = pathMatches[0][1:][i]
 					}
 				}
-			}
-		}
 
-		// query part
-		for k, v := range vals {
-			normalizedK := regexp.MustCompile(`\.member\.[0-9]+`).ReplaceAllString(k, "[]")
-			normalizedK = regexp.MustCompile(`\.[0-9]+`).ReplaceAllString(normalizedK, "[]")
+				// query part
+				for k, v := range vals {
+					normalizedK := regexp.MustCompile(`\.member\.[0-9]+`).ReplaceAllString(k, "[]")
+					normalizedK = regexp.MustCompile(`\.[0-9]+`).ReplaceAllString(normalizedK, "[]")
 
-			resolvedPropertyName := resolvePropertyName(serviceDef.Operations[action].Input, normalizedK, "", "", serviceDef.Shapes)
-			if resolvedPropertyName != "" {
-				normalizedK = resolvedPropertyName
-			}
+					resolvedPropertyName := resolvePropertyName(serviceDef.Operations[action].Input, normalizedK, "", "", serviceDef.Shapes)
+					if resolvedPropertyName != "" {
+						normalizedK = resolvedPropertyName
+					} else {
+						// continue // Skipping just in case
+					}
 
-			if len(params[normalizedK]) > 0 {
-				params[normalizedK] = append(params[normalizedK], v...)
-			} else {
-				params[normalizedK] = v
+					if len(params[normalizedK]) > 0 {
+						params[normalizedK] = append(params[normalizedK], v...)
+					} else {
+						params[normalizedK] = v
+					}
+				}
+
+				// header part
+				for k, v := range req.Header {
+					resolvedPropertyName := resolvePropertyName(serviceDef.Operations[action].Input, k, "", "", serviceDef.Shapes)
+					if resolvedPropertyName != "" {
+						k = resolvedPropertyName
+					} else {
+						continue
+					}
+
+					if len(params[k]) > 0 {
+						params[k] = append(params[k], v...)
+					} else {
+						params[k] = v
+					}
+				}
+
+				// body part
+				if len(body) > 0 {
+					if serviceDef.Metadata.Protocol == "rest-json" {
+						var bodyJSON interface{}
+						err := json.Unmarshal(body, &bodyJSON)
+						if err != nil {
+							return
+						}
+
+						flatten(true, params, bodyJSON, "")
+					} else {
+						var bodyXML interface{}
+						err := xml.Unmarshal(body, &bodyXML)
+						if err != nil {
+							return
+						}
+
+						flatten(true, params, bodyXML, "")
+					}
+				}
+
+				actionCandidates = append(actionCandidates, ActionCandidate{
+					Path:      path,
+					Action:    action,
+					Params:    params,
+					URIParams: uriparams,
+					Operation: operation,
+				})
 			}
 		}
 
-		// body part
-		if len(body) > 0 {
-			var bodyXML interface{}
-			err := xml.Unmarshal(body, &bodyXML)
-			if err != nil {
-				return
+		// select candidate
+		var selectedActionCandidate ActionCandidate
+	ActionCandidateLoop:
+		for _, actionCandidate := range actionCandidates {
+			for _, requiredParam := range actionCandidate.Operation.Input.Required { // check input requirements
+				if _, ok := actionCandidate.Params[requiredParam]; ok {
+					continue
+				}
+				if _, ok := actionCandidate.URIParams[requiredParam]; ok {
+					continue
+				}
+				continue ActionCandidateLoop // requirements not met
+			}
+			if selectedActionCandidate.Action == "" { // first one
+				selectedActionCandidate = actionCandidate
+				continue
+			}
+			if len(actionCandidate.Path) > len(selectedActionCandidate.Path) { // longer path wins
+				selectedActionCandidate = actionCandidate
+				continue
+			}
+			if len(actionCandidate.Operation.Input.Required) > len(selectedActionCandidate.Operation.Input.Required) { // more requirements wins
+				selectedActionCandidate = actionCandidate
+				continue
 			}
-
-			flatten(true, params, bodyXML, "")
 		}
+		action = selectedActionCandidate.Action
+		params = selectedActionCandidate.Params
+		uriparams = selectedActionCandidate.URIParams
+	}
+
+	if action == "" {
+		return
 	}
 
 	region := "us-east-1"