Fixed improper handling of base path

Prevent header-processing logic from dropping custom headers in 'automate' mode

cmd/requests.go

@@ -98,22 +98,19 @@ func MakeRequest(client http.Client, method, target string, timeout int64, reqDa
 			continue
 		}
 
-		key := Headers[i][:delimIndex]
-		value := Headers[i][delimIndex+1:]
+		key := strings.TrimSpace(Headers[i][:delimIndex])
+		value := strings.TrimSpace(Headers[i][delimIndex+1:])
 
-		if len(Headers) == 2 {
-			if key == "User-Agent" {
-				UserAgent = value
-			}
-			if key == "Content-Type" {
-				contentType = value
-			}
-			if key == "Accept" {
-				accept = value
-			}
-		} else {
-			req.Header.Set(key, value)
+		if key == "User-Agent" {
+			UserAgent = value
 		}
+		if key == "Content-Type" {
+			contentType = value
+		}
+		if key == "Accept" {
+			accept = value
+		}
+		req.Header.Set(key, value)
 	}
 
 	// User-Agent handling

cmd/root.go

@@ -49,7 +49,7 @@ $ sj convert -u https://petstore.swagger.io/v2/swagger.json -o openapi.json`,
 			log.Error("Command not specified. See the --help flag for usage.")
 		}
 	},
-	Version: "2.0.0",
+	Version: "2.0.4",
 }
 
 func Execute() {

cmd/utils.go

@@ -96,9 +96,11 @@ func GenerateRequests(bodyBytes []byte, client http.Client) {
 						if serverURL, ok := srv["url"].(string); ok {
 							if strings.Contains(serverURL, "://") {
 								apiTarget = serverURL
+							} else if serverURL == "/" {
+								basePath = ""
 							} else {
 								basePath = serverURL
-								apiTarget = u.Scheme + "://" + u.Host + serverURL
+								apiTarget = u.Scheme + "://" + u.Host
 							}
 						}
 					}
@@ -181,7 +183,20 @@ func BuildRequestsFromPaths(spec map[string]interface{}, client http.Client) {
 																var pValue string
 																if propertyName, ok := properties[propertyItem].(map[string]interface{}); ok {
 																	if exampleValue, ok := propertyName["example"]; ok {
-																		pValue = exampleValue.(string)
+																		switch ex := exampleValue.(type) {
+																		case string:
+																			pValue = exampleValue.(string)
+																		case []interface{}:
+																			if len(ex) > 0 {
+																				if v, ok := ex[0].(string); ok {
+																					pValue = v
+																				} else {
+																					pValue = "1"
+																				}
+																			}
+																		default:
+																			pValue = "1"
+																		}
 																	} else if propertyType, ok := propertyName["type"].(string); ok {
 																		// Attempt to prevent version strings from being improperly supplied (i.e. v1)
 																		if propertyType == "string" && propertyName["name"] != "version" {
@@ -192,7 +207,7 @@ func BuildRequestsFromPaths(spec map[string]interface{}, client http.Client) {
 
 																	}
 
-																	if strings.Contains(curl, "-d") {
+																	if strings.Contains(curl, "-d '") {
 																		bodyData += fmt.Sprintf("&%s=%s", propertyItem, pValue)
 																		curl = strings.TrimSuffix(curl, "'")
 																		curl += fmt.Sprintf("&%s=%s'", propertyItem, pValue)
@@ -200,7 +215,6 @@ func BuildRequestsFromPaths(spec map[string]interface{}, client http.Client) {
 																		bodyData += fmt.Sprintf("%s=%s", propertyItem, pValue)
 																		curl += fmt.Sprintf(" -d '%s=%s'", propertyItem, pValue)
 																	}
-
 																}
 															}
 														}
@@ -229,7 +243,7 @@ func BuildRequestsFromPaths(spec map[string]interface{}, client http.Client) {
 										case "header":
 											curl += fmt.Sprintf(" -H \"%s: %s\"", name, pValue)
 										case "body":
-											if strings.Contains(curl, "-d") {
+											if strings.Contains(curl, "-d '") {
 												bodyData += fmt.Sprintf("&%s=%s", name, pValue)
 												curl = strings.TrimSuffix(curl, "'")
 												curl += fmt.Sprintf("&%s=%s'", name, pValue)
@@ -384,7 +398,7 @@ func BuildRequestsFromPaths(spec map[string]interface{}, client http.Client) {
 										jsonResultsStringArray = append(jsonResultsStringArray, ","+string(result))
 									}
 									if outputFormat == "console" {
-										writeLog(sc, basePath+logURL.Path, strings.ToUpper(method), errorDescriptions[sc], resp[:tempResponsePreviewLength])
+										writeLog(sc, logURL.Path, strings.ToUpper(method), errorDescriptions[sc], resp[:tempResponsePreviewLength])
 									}
 								}
 							} else {
@@ -394,7 +408,7 @@ func BuildRequestsFromPaths(spec map[string]interface{}, client http.Client) {
 									jsonResultsStringArray = append(jsonResultsStringArray, ","+string(result))
 								}
 								if outputFormat == "console" {
-									writeLog(sc, basePath+logURL.Path, strings.ToUpper(method), errorDescriptions[sc], resp[:tempResponsePreviewLength])
+									writeLog(sc, logURL.Path, strings.ToUpper(method), errorDescriptions[sc], resp[:tempResponsePreviewLength])
 								}
 							}