Return HTTP status code accordingly

rafael-santiago · Dec 8, 2024 · c01c563 · c01c563
1 parent fd87dc7
commit c01c563
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/src/internal/actions/action.go b/src/internal/actions/action.go
@@ -10,6 +10,7 @@ package actions
 import (
     "internal/vars"
     "net/url"
+    "net/http"
 )
 
 type EutherpeActionFunc func(eutherpeInstance *vars.EutherpeVars, userData *url.Values) error
@@ -240,6 +241,7 @@ func GetContentTypeByActionId(userData *url.Values) string {
 }
 
 func GetVDocByActionId(userData *url.Values, eutherpeVars *vars.EutherpeVars) string {
+    httpStatus := http.StatusNotFound
     switch userData.Get(vars.EutherpeActionId) {
         case vars.EutherpeMusicRemoveId,
              vars.EutherpeMusicMoveUpId,
@@ -288,10 +290,13 @@ func GetVDocByActionId(userData *url.Values, eutherpeVars *vars.EutherpeVars) st
              vars.EutherpeSettingsSetWLANCredentialsId,
              vars.EutherpeSettingsSetHostNameId,
              vars.EutherpeSettingsPowerOffId,
-             vars.EutherpeSettingsRebootId:
+             vars.EutherpeSettingsRebootId,
+             vars.EutherpeSetCurrentConfigId:
+            httpStatus = http.StatusOK
             return eutherpeVars.HTTPd.IndexHTML
 
         case vars.EutherpeAuthenticateId:
+            httpStatus = http.StatusOK
             if eutherpeVars.LastError == nil {
                 return "<html><script>window.location=\"{{.URL-SCHEMA}}://{{.EUTHERPE-ADDR}}/eutherpe\"</script></html>"
             } else {
@@ -300,8 +305,9 @@ func GetVDocByActionId(userData *url.Values, eutherpeVars *vars.EutherpeVars) st
             break
 
         case vars.EutherpePlayerStatusId:
+            httpStatus = http.StatusOK
             return vars.EutherpeTemplateNeedlePlayerStatus
     }
-
+    eutherpeVars.HTTPd.ResponseWriter.WriteHeader(httpStatus)
     return eutherpeVars.HTTPd.ErrorHTML
 }
diff --git a/src/internal/vars/vars.go b/src/internal/vars/vars.go
@@ -26,6 +26,7 @@ import (
     "fmt"
     "strings"
     "net"
+    "net/http"
     "time"
     "crypto/sha256"
 )
@@ -48,6 +49,7 @@ type EutherpeVars struct {
         ErrorHTML string
         LoginHTML string
         RequestedByHostName bool
+        ResponseWriter http.ResponseWriter
     }
     MDNS struct {
         Hosts []mdns.MDNSHost

diff --git a/src/internal/webui/ui.go b/src/internal/webui/ui.go
@@ -113,6 +113,7 @@ func eutherpeHTTPd(eutherpeHTTPHandler EutherpeHTTPHandler,
 func (ehh *EutherpeHTTPHandler) handler(w http.ResponseWriter, r *http.Request) {
     ehh.requestTurnstile.Lock()
     defer ehh.requestTurnstile.Unlock()
+    ehh.eutherpeVars.HTTPd.ResponseWriter = w
     var templatedOutput string
     if len(ehh.eutherpeVars.HostName) > 0 &&
        strings.HasPrefix(r.Host, ehh.eutherpeVars.HostName) {
@@ -153,13 +154,15 @@ func (ehh *EutherpeHTTPHandler) handler(w http.ResponseWriter, r *http.Request)
                     }
                     contentType = actions.GetContentTypeByActionId(&r.Form)
                 } else {
+                    w.WriteHeader(http.StatusNotImplemented)
                     templatedOutput = ehh.eutherpeVars.HTTPd.ErrorHTML
                     ehh.eutherpeVars.LastError = fmt.Errorf("501 Not Implemented")
                 }
                 w.Header().Set("content-type", contentType)
             break
         case "/eutherpe-auth":
             if !ehh.eutherpeVars.HTTPd.Authenticated {
+                w.WriteHeader(http.StatusSeeOther)
                 templatedOutput = ehh.eutherpeVars.HTTPd.ErrorHTML
                 ehh.eutherpeVars.LastError = fmt.Errorf("303 See Other")
             } else if r.Method == "GET" {
@@ -172,6 +175,7 @@ func (ehh *EutherpeHTTPHandler) handler(w http.ResponseWriter, r *http.Request)
                 r.URL.Path = "/eutherpe"
                 template = vars.EutherpeIndexTemplate
             } else {
+                w.WriteHeader(http.StatusNotImplemented)
                 templatedOutput = ehh.eutherpeVars.HTTPd.ErrorHTML
                 ehh.eutherpeVars.LastError = fmt.Errorf("501 Not Implemented")
             }
@@ -202,6 +206,7 @@ func (ehh *EutherpeHTTPHandler) processAction(actionHandler actions.EutherpeActi
 func (ehh *EutherpeHTTPHandler) processGET(w *http.ResponseWriter, r *http.Request) string {
     vdoc := r.URL.Path
     if !ehh.isPubFile(vdoc) {
+        (*w).WriteHeader(http.StatusForbidden)
         ehh.eutherpeVars.LastError = fmt.Errorf("403 Forbidden")
         return ehh.eutherpeVars.HTTPd.ErrorHTML
     }