Fixed bug in response handling when a definition file initiates a redirect

twest-bf · twest-bf · commit 8261a1c154de · 2024-07-18T16:43:43.000-04:00
diff --git a/cmd/requests.go b/cmd/requests.go
@@ -152,6 +152,13 @@ func MakeRequest(client http.Client, method, target string, timeout int64, reqDa
 
 	bodyBytes, _ := io.ReadAll(resp.Body)
 	bodyString := string(bodyBytes)
+
+	if (resp.StatusCode == 301 || resp.StatusCode == 302) && strings.Contains(bodyString, "<html>") {
+		redirect, _ := resp.Location()
+		bodyBytes, bodyString, requestStatus = MakeRequest(client, method, redirect.Scheme+"://"+redirect.Host+redirect.Path, timeout, reqData)
+		return bodyBytes, bodyString, requestStatus
+	}
+
 	requestStatus = resp.StatusCode
 
 	return bodyBytes, bodyString, requestStatus
diff --git a/cmd/root.go b/cmd/root.go
@@ -46,7 +46,7 @@ $ sj brute -u https://petstore.swagger.io`,
 			log.Error("Command not specified. See the --help flag for usage.")
 		}
 	},
-	Version: "1.5.0",
+	Version: "1.5.1",
 }
 
 func Execute() {
diff --git a/cmd/utils.go b/cmd/utils.go
@@ -469,8 +469,14 @@ func UnmarshalSpec(bodyBytes []byte) (newDoc *openapi3.T) {
 		_ = yaml.Unmarshal(bodyBytes, &doc)
 		_ = yaml.Unmarshal(bodyBytes, &doc3)
 	}
-	_ = json.Unmarshal(bodyBytes, &doc)
-	_ = json.Unmarshal(bodyBytes, &doc3)
+	err := json.Unmarshal(bodyBytes, &doc)
+	if err != nil {
+		err = json.Unmarshal(bodyBytes, &doc3)
+		if err != nil {
+			log.Fatalf("Error unmarshalling API definitions: %s\n", err)
+		}
+	}
+	err = json.Unmarshal(bodyBytes, &doc3)
 
 	if strings.HasPrefix(doc3.OpenAPI, "3") {
 		newDoc := &doc3
@@ -485,7 +491,7 @@ func UnmarshalSpec(bodyBytes []byte) (newDoc *openapi3.T) {
 		var noDoc openapi3.T
 		return &noDoc
 	} else {
-		log.Fatal("Error parsing definition file.\n")
+		log.Fatalf("Error parsing definition file: %s\n", doc3.OpenAPI)
 		return nil
 	}
 }

Original file line number	Diff line number	Diff line change
@@ -46,7 +46,7 @@ $ sj brute -u https://petstore.swagger.io`,
`46`	`46`	`log.Error("Command not specified. See the --help flag for usage.")`
`47`	`47`	`}`
`48`	`48`	`},`
`49`		`- Version: "1.5.0",`
	`49`	`+ Version: "1.5.1",`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`func Execute() {`