PLG_Development/PLG-MuDiCS
3
0
Fork 0
mirror of https://codeberg.org/PLG-Development/PLG-MuDiCS synced 2026-07-06 00:47:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: share bad request text

Browse Source
This commit is contained in:
2mal3
2025-11-23 13:09:45 +01:00
parent c95ce4bde4
commit fa851eb51d
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
display/web/main.go
+5 -6
View File
@@ -27,7 +27,6 @@ import (
var version string var version string
var sseConnection chan string var sseConnection chan string
var badRequestDescription string = "Request uses invalid JSON syntax or does not follow request schema."
func StartWebServer(v string, port string) { func StartWebServer(v string, port string) {
version = v version = v
@@ -167,7 +166,7 @@ func shellCommandRoute(ctx echo.Context) error {
} }
if err := ctx.Bind(&commandInput); err != nil { if err := ctx.Bind(&commandInput); err != nil {
slog.Error("Failed to parse shell command", "error", err) slog.Error("Failed to parse shell command", "error", err)
return ctx.JSON(http.StatusBadRequest, shared.ErrorResponse{Description: badRequestDescription}) return ctx.JSON(http.StatusBadRequest, shared.ErrorResponse{Description: shared.BadRequestDescription})
} }
cmd := exec.Command("bash", "-c", commandInput.Command) cmd := exec.Command("bash", "-c", commandInput.Command)
@@ -194,10 +193,10 @@ func keyboardInputRoute(ctx echo.Context) error {
} }
if err := ctx.Bind(&request); err != nil { if err := ctx.Bind(&request); err != nil {
slog.Error("Failed to parse keyboard input", "error", err) slog.Error("Failed to parse keyboard input", "error", err)
return ctx.JSON(http.StatusBadRequest, shared.ErrorResponse{Description: badRequestDescription}) return ctx.JSON(http.StatusBadRequest, shared.ErrorResponse{Description: shared.BadRequestDescription})
} }
if request.Action != "press" && request.Action != "release" { if request.Action != "press" && request.Action != "release" {
return ctx.JSON(http.StatusBadRequest, shared.ErrorResponse{Description: badRequestDescription}) return ctx.JSON(http.StatusBadRequest, shared.ErrorResponse{Description: shared.BadRequestDescription})
} }
code, ok := pkg.KeyboardEvents[request.Key] code, ok := pkg.KeyboardEvents[request.Key]
@@ -238,7 +237,7 @@ func uploadFileRoute(ctx echo.Context) error {
data, err := io.ReadAll(ctx.Request().Body) data, err := io.ReadAll(ctx.Request().Body)
if err != nil { if err != nil {
return ctx.JSON(http.StatusBadRequest, shared.ErrorResponse{Description: badRequestDescription}) return ctx.JSON(http.StatusBadRequest, shared.ErrorResponse{Description: shared.BadRequestDescription})
} }
if err := os.WriteFile(fullPath, data, os.ModePerm); err != nil { if err := os.WriteFile(fullPath, data, os.ModePerm); err != nil {
@@ -315,7 +314,7 @@ func showHTMLRoute(ctx echo.Context) error {
} }
if err := ctx.Bind(&request); err != nil { if err := ctx.Bind(&request); err != nil {
slog.Error("Failed to parse request", "error", err) slog.Error("Failed to parse request", "error", err)
return ctx.JSON(http.StatusBadRequest, shared.ErrorResponse{Description: badRequestDescription}) return ctx.JSON(http.StatusBadRequest, shared.ErrorResponse{Description: shared.BadRequestDescription})
} }
err := resetView() err := resetView()
shared/main.go
+2
View File
@@ -16,6 +16,8 @@ type ErrorResponse struct {
Description string `json:"description"` Description string `json:"description"`
} }
var BadRequestDescription string = "Request uses invalid JSON syntax or does not follow request schema."
func RunShellCommand(cmd *exec.Cmd) CommandResponse { func RunShellCommand(cmd *exec.Cmd) CommandResponse {
var stdout, stderr bytes.Buffer var stdout, stderr bytes.Buffer
cmd.Stdout = &stdout cmd.Stdout = &stdout