Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: Add JSON Body Support in /api Route #88

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+25 −6
Open

Fix: Add JSON Body Support in /api Route #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cmd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@ func main() {
app := fiber.New(
fiber.Config{
Prefork: *prefork,
GETOnly: true,
},
)

Expand Down Expand Up @@ -137,7 +136,8 @@ func main() {

app.Get("ruleset", handlers.Ruleset)
app.Get("raw/*", handlers.Raw)
app.Get("api/*", handlers.Api)
app.Post("/api", handlers.Api)
app.Get("/api/*", handlers.Api)
app.Get("/*", handlers.ProxySite(*ruleset))

log.Fatal(app.Listen(":" + *port))
Expand Down
27 changes: 23 additions & 4 deletions handlers/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,35 @@ import (
"github.com/gofiber/fiber/v2"
)

type JsonRequest struct {
URL string `json:"url"`
}

//nolint:all
//go:embed VERSION
var version string

func Api(c *fiber.Ctx) error {
// Get the url from the URL
urlQuery := c.Params("*")

var url string
queries := c.Queries()
body, req, resp, err := fetchSite(urlQuery, queries)

// Check content type to determine if it's JSON
contentType := c.Get("Content-Type")
if contentType == "application/json" {
// Parse JSON body
var jsonReq JsonRequest
if err := c.BodyParser(&jsonReq); err != nil {
return c.Status(fiber.StatusBadRequest).JSON(fiber.Map{
"error": "Invalid JSON request",
})
}
url = jsonReq.URL
} else {
// Get the url from the URL params
url = c.Params("*")
}

body, req, resp, err := fetchSite(url, queries)
if err != nil {
log.Println("ERROR:", err)
c.SendStatus(500)
Expand Down